diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:23:36 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:23:36 -0400 |
| commit | 766d02786ecd22932beeb9ca8bad6d8c5a552ef9 (patch) | |
| tree | f6f2df0e35bbea914d1f4d12be6d02f128c73575 /include/asm-arm/arch-omap/gpio.h | |
| parent | 906d882cacecd37ad2fdd03ed2a9b232bcb9507e (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'include/asm-arm/arch-omap/gpio.h')
| -rw-r--r-- | include/asm-arm/arch-omap/gpio.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-arm/arch-omap/gpio.h b/include/asm-arm/arch-omap/gpio.h index 86621a04cd8f..5ee6a49864c3 100644 --- a/include/asm-arm/arch-omap/gpio.h +++ b/include/asm-arm/arch-omap/gpio.h | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #ifndef __ASM_ARCH_OMAP_GPIO_H | 26 | #ifndef __ASM_ARCH_OMAP_GPIO_H |
| 27 | #define __ASM_ARCH_OMAP_GPIO_H | 27 | #define __ASM_ARCH_OMAP_GPIO_H |
| 28 | 28 | ||
| 29 | #include <asm/hardware.h> | ||
| 30 | #include <asm/arch/irqs.h> | 29 | #include <asm/arch/irqs.h> |
| 31 | #include <asm/io.h> | 30 | #include <asm/io.h> |
| 32 | 31 | ||