diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-08 16:13:36 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-08 16:13:36 +0000 |
| commit | f3840df9e3ed46f57ffd308ba747de08f751ecd8 (patch) | |
| tree | ace8250200685fffa680cc2cf1339d9897a2329a /arch/arm/mach-pxa | |
| parent | 3642a0a2c7d2d1949988d0fd004a8039c1f3d02f (diff) | |
| parent | e0bf102e1df73182e98c5ff96711b04534bc7bd9 (diff) | |
| download | blackbird-op-linux-f3840df9e3ed46f57ffd308ba747de08f751ecd8.tar.gz blackbird-op-linux-f3840df9e3ed46f57ffd308ba747de08f751ecd8.zip | |
Merge branch 'drivers/pxa-gpio' into next/drivers
Diffstat (limited to 'arch/arm/mach-pxa')
| -rw-r--r-- | arch/arm/mach-pxa/corgi_pm.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/spitz_pm.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c index eca862fb2cd5..39e265cfc86d 100644 --- a/arch/arm/mach-pxa/corgi_pm.c +++ b/arch/arm/mach-pxa/corgi_pm.c @@ -15,6 +15,7 @@ #include <linux/kernel.h> #include <linux/delay.h> #include <linux/gpio.h> +#include <linux/gpio-pxa.h> #include <linux/interrupt.h> #include <linux/platform_device.h> #include <linux/apm-emulation.h> diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c index 5cc05d122d0c..34cbdac51525 100644 --- a/arch/arm/mach-pxa/spitz_pm.c +++ b/arch/arm/mach-pxa/spitz_pm.c @@ -15,6 +15,7 @@ #include <linux/kernel.h> #include <linux/delay.h> #include <linux/gpio.h> +#include <linux/gpio-pxa.h> #include <linux/interrupt.h> #include <linux/platform_device.h> #include <linux/apm-emulation.h> |
