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 /drivers/staging/cg2900/bluetooth/cg2900_uart.c | |
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>
Diffstat (limited to 'drivers/staging/cg2900/bluetooth/cg2900_uart.c')
-rw-r--r-- | drivers/staging/cg2900/bluetooth/cg2900_uart.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 */ |