diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 17:44:18 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 17:44:18 -0400 |
| commit | 43872fa788060eef91ae437957e0a5e39f1c56fd (patch) | |
| tree | dba464da61167d84b4f7470edebd5a769a78f9ee /arch/arm/plat-omap/devices.c | |
| parent | 91fed558d0f33c74477569f50ed883fe6d430f1f (diff) | |
| parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) | |
Merge branch 'depends/rmk/gpio' into next/fixes
This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-omap/devices.c')
| -rw-r--r-- | arch/arm/plat-omap/devices.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index ea28f98d5d6a..64c3bd4aa54e 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | * the Free Software Foundation; either version 2 of the License, or | 8 | * the Free Software Foundation; either version 2 of the License, or |
| 9 | * (at your option) any later version. | 9 | * (at your option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | #include <linux/gpio.h> | |
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <plat/tc.h> | 24 | #include <plat/tc.h> |
| 25 | #include <plat/board.h> | 25 | #include <plat/board.h> |
| 26 | #include <plat/mmc.h> | 26 | #include <plat/mmc.h> |
| 27 | #include <mach/gpio.h> | ||
| 28 | #include <plat/menelaus.h> | 27 | #include <plat/menelaus.h> |
| 29 | #include <plat/mcbsp.h> | 28 | #include <plat/mcbsp.h> |
| 30 | #include <plat/omap44xx.h> | 29 | #include <plat/omap44xx.h> |