diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/arm/mach-omap2/gpmc-smc91x.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/arm/mach-omap2/gpmc-smc91x.c')
| -rw-r--r-- | arch/arm/mach-omap2/gpmc-smc91x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/gpmc-smc91x.c b/arch/arm/mach-omap2/gpmc-smc91x.c index df99d31d8b6..6083e21b3be 100644 --- a/arch/arm/mach-omap2/gpmc-smc91x.c +++ b/arch/arm/mach-omap2/gpmc-smc91x.c | |||
| @@ -17,9 +17,9 @@ | |||
| 17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
| 18 | #include <linux/smc91x.h> | 18 | #include <linux/smc91x.h> |
| 19 | 19 | ||
| 20 | #include <mach/board.h> | 20 | #include <plat/board.h> |
| 21 | #include <mach/gpmc.h> | 21 | #include <plat/gpmc.h> |
| 22 | #include <mach/gpmc-smc91x.h> | 22 | #include <plat/gpmc-smc91x.h> |
| 23 | 23 | ||
| 24 | static struct omap_smc91x_platform_data *gpmc_cfg; | 24 | static struct omap_smc91x_platform_data *gpmc_cfg; |
| 25 | 25 | ||