diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-17 08:32:26 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-17 08:32:26 -0600 |
| commit | f8db4cc4f2b11bdded6c94f0d55906847474b982 (patch) | |
| tree | d1b99d186edb9d203fafd896f19487125a2395af /arch/arm/mach-omap2/board-2430sdp.c | |
| parent | 2e2de2e314672c8b6644f67a35556d6df780493d (diff) | |
| parent | e479c60456ef22b0869432887216186aabaed086 (diff) | |
| download | op-kernel-dev-f8db4cc4f2b11bdded6c94f0d55906847474b982.zip op-kernel-dev-f8db4cc4f2b11bdded6c94f0d55906847474b982.tar.gz | |
Merge branch 'spi/merge' into spi/next
Diffstat (limited to 'arch/arm/mach-omap2/board-2430sdp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-2430sdp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index d54969b..5de6eac 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c @@ -26,13 +26,13 @@ #include <linux/err.h> #include <linux/clk.h> #include <linux/io.h> +#include <linux/gpio.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/gpio.h> #include <plat/board.h> #include <plat/common.h> #include <plat/gpmc.h> |
