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/mach-at91/gpio.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/mach-at91/gpio.c')
| -rw-r--r-- | arch/arm/mach-at91/gpio.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c index 4615528205c8..224e9e2f8674 100644 --- a/arch/arm/mach-at91/gpio.c +++ b/arch/arm/mach-at91/gpio.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/clk.h> | 12 | #include <linux/clk.h> |
| 13 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 14 | #include <linux/gpio.h> | ||
| 14 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
| 15 | #include <linux/irq.h> | 16 | #include <linux/irq.h> |
| 16 | #include <linux/debugfs.h> | 17 | #include <linux/debugfs.h> |
| @@ -22,9 +23,6 @@ | |||
| 22 | 23 | ||
| 23 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
| 24 | #include <mach/at91_pio.h> | 25 | #include <mach/at91_pio.h> |
| 25 | #include <mach/gpio.h> | ||
| 26 | |||
| 27 | #include <asm/gpio.h> | ||
| 28 | 26 | ||
| 29 | #include "generic.h" | 27 | #include "generic.h" |
| 30 | 28 | ||