diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-12-13 17:34:57 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:05:56 +0200 |
| commit | cd350bc097326892bcae9f56d88328918edba576 (patch) | |
| tree | fe53283d017e8ed0a7e9d2ec5934c27324d32452 | |
| parent | 8cdb3a51da2385375ca7cfd0a777a3abb97b9633 (diff) | |
cg2900: updates for 3.2
Update for headers file (linux/module.h + linux/pm_qos.h)
Replace CONFIG_MFD_SUPPORT by HAS_IOMEM + select MFD_CORE
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
| -rw-r--r-- | drivers/staging/cg2900/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/staging/cg2900/bluetooth/cg2900_uart.c | 4 | ||||
| -rw-r--r-- | drivers/staging/cg2900/clock-cg2900.c | 1 | ||||
| -rw-r--r-- | drivers/staging/cg2900/mfd/cg2900_lib.c | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/drivers/staging/cg2900/Kconfig b/drivers/staging/cg2900/Kconfig index 2a0d14c4fbe..92046b9bf76 100644 --- a/drivers/staging/cg2900/Kconfig +++ b/drivers/staging/cg2900/Kconfig @@ -4,7 +4,8 @@ config CG2900 tristate "Support ST-Ericsson CG2900 main structure" - depends on NET && MFD_SUPPORT + depends on NET && HAS_IOMEM + select MFD_CORE help ST-Ericsson CG2900 Connectivity Combo controller main structure. diff --git a/drivers/staging/cg2900/bluetooth/cg2900_uart.c b/drivers/staging/cg2900/bluetooth/cg2900_uart.c index 61194e0b25e..69e64f6a452 100644 --- a/drivers/staging/cg2900/bluetooth/cg2900_uart.c +++ b/drivers/staging/cg2900/bluetooth/cg2900_uart.c @@ -24,7 +24,7 @@ #include <linux/mutex.h> #include <linux/platform_device.h> #include <linux/pm.h> -#include <linux/pm_qos_params.h> +#include <linux/pm_qos.h> #include <linux/poll.h> #include <linux/sched.h> #include <linux/skbuff.h> @@ -321,7 +321,7 @@ struct uart_info { int cts_irq; int cts_gpio; bool suspend_blocked; - struct pm_qos_request_list pm_qos_latency; + struct pm_qos_request pm_qos_latency; }; /* Module parameters */ diff --git a/drivers/staging/cg2900/clock-cg2900.c b/drivers/staging/cg2900/clock-cg2900.c index cc763f8c548..6e3c738e49d 100644 --- a/drivers/staging/cg2900/clock-cg2900.c +++ b/drivers/staging/cg2900/clock-cg2900.c @@ -15,6 +15,7 @@ #include <linux/clkdev.h> #include <linux/errno.h> #include <linux/kernel.h> +#include <linux/module.h> #include <linux/mutex.h> #include <linux/platform_device.h> #include <linux/skbuff.h> diff --git a/drivers/staging/cg2900/mfd/cg2900_lib.c b/drivers/staging/cg2900/mfd/cg2900_lib.c index e34d7477594..84f7eb5eb62 100644 --- a/drivers/staging/cg2900/mfd/cg2900_lib.c +++ b/drivers/staging/cg2900/mfd/cg2900_lib.c @@ -11,6 +11,7 @@ #include <linux/kernel.h> #include <linux/limits.h> +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/types.h> |