IPC: Fix merge problems.
authorFei Yang <fei.yang@intel.com>
Mon, 12 Sep 2011 21:54:45 +0000 (14:54 -0700)
committermgross <mark.gross@intel.com>
Wed, 9 Nov 2011 20:38:02 +0000 (12:38 -0800)
commitc745aaa5f4cdfe0ff1a05c610d6ba135a9625fed
treea88d1076ccdefdd9095780b3d2c41a88a47dc15a
parent708491b0b6e39dc0c95a2aaf04b83e3e582ce78b
IPC: Fix merge problems.

The latest version in 2.6.35 tree is using if-else statement in function
scu_ipc_ioctl, however in AC tree switch-case statement is used instead,
need to add break instruction accordingly.
Also CPU type checking is introduced in 2.6.35 tree, need to merge that
change for INTEL_SCU_IPC_FW_UPDATE.
In Linux 3.0 pm_qos_add_request doesn't allocate memory any more, the
function requires a pre-allocated struct pm_qos_request_list. make change
in intel_scu_ipc_init accordingly.

Change-Id: Ia36a46030f52ad3f68c0c8e9d101bb049460e2ec
Signed-off-by: Fei Yang <fei.yang@intel.com>
drivers/platform/x86/intel_scu_ipc.c
drivers/platform/x86/intel_scu_ipcutil.c