diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:46:42 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:46:42 -0400 |
| commit | efa62e1355f0495f37f1296754b8880947c8da72 (patch) | |
| tree | c07af29f8baf2e6f4ed3bedbe46d405924edd530 /arch/arm/mach-mmp/mmp2.c | |
| parent | 107532920226a37e595697959b2a6a823cfa2497 (diff) | |
| parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) | |
Merge branch 'depends/rmk/gpio' into next/devel
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/gpio.h
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-mmp/mmp2.c')
| -rw-r--r-- | arch/arm/mach-mmp/mmp2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c index 079c18861d5c..65d8689e40c9 100644 --- a/arch/arm/mach-mmp/mmp2.c +++ b/arch/arm/mach-mmp/mmp2.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * it under the terms of the GNU General Public License version 2 as | 9 | * it under the terms of the GNU General Public License version 2 as |
| 10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
| 11 | */ | 11 | */ |
| 12 | |||
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| @@ -25,7 +24,7 @@ | |||
| 25 | #include <mach/irqs.h> | 24 | #include <mach/irqs.h> |
| 26 | #include <mach/dma.h> | 25 | #include <mach/dma.h> |
| 27 | #include <mach/mfp.h> | 26 | #include <mach/mfp.h> |
| 28 | #include <mach/gpio.h> | 27 | #include <mach/gpio-pxa.h> |
| 29 | #include <mach/devices.h> | 28 | #include <mach/devices.h> |
| 30 | #include <mach/mmp2.h> | 29 | #include <mach/mmp2.h> |
| 31 | 30 | ||