diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:25:41 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:25:41 -0400 |
| commit | 3e965b176341b78620f7404fd8b7f9a0d061f8a2 (patch) | |
| tree | a2dbf06d6ae20fbe417b70f0a471cc4f93ff0a71 /arch/arm/mach-at91/board-sam9-l9260.c | |
| parent | 034ee299122c6b145d6d3cafb9ef5c329a4ab990 (diff) | |
| parent | 5839fec9d8db35b2b07359b18a77295418e239ad (diff) | |
Merge branch 'next/fixes' into next/cleanup
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/gpio.h
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c
Diffstat (limited to 'arch/arm/mach-at91/board-sam9-l9260.c')
| -rw-r--r-- | arch/arm/mach-at91/board-sam9-l9260.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c index 4d3a02f1289e..2a21e790250e 100644 --- a/arch/arm/mach-at91/board-sam9-l9260.c +++ b/arch/arm/mach-at91/board-sam9-l9260.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/types.h> | 23 | #include <linux/types.h> |
| 24 | #include <linux/gpio.h> | ||
| 24 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 25 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
| 26 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| @@ -37,7 +38,6 @@ | |||
| 37 | #include <asm/mach/irq.h> | 38 | #include <asm/mach/irq.h> |
| 38 | 39 | ||
| 39 | #include <mach/board.h> | 40 | #include <mach/board.h> |
| 40 | #include <mach/gpio.h> | ||
| 41 | #include <mach/at91sam9_smc.h> | 41 | #include <mach/at91sam9_smc.h> |
| 42 | 42 | ||
| 43 | #include "sam9_smc.h" | 43 | #include "sam9_smc.h" |