diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 21:46:10 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 21:46:10 -0400 |
| commit | 884897e6a10a86de0e611a76f4bf3fd0068a672c (patch) | |
| tree | 019689fb9d129404af1efba4df10975bc9e0a57a /arch/arm/mach-mmp/jasper.c | |
| parent | c72dbae971400e466ad9ff16c920cd6d9d8c55a1 (diff) | |
| parent | 8b61f37440388ebbd2a894178fe098f2e70ab392 (diff) | |
Merge branch 'highbank/soc' into next/soc
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-omap2/board-generic.c
arch/arm/plat-mxc/include/mach/gpio.h
Diffstat (limited to 'arch/arm/mach-mmp/jasper.c')
| -rw-r--r-- | arch/arm/mach-mmp/jasper.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/jasper.c b/arch/arm/mach-mmp/jasper.c index 5d6421d63254..8bfac6612623 100644 --- a/arch/arm/mach-mmp/jasper.c +++ b/arch/arm/mach-mmp/jasper.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
| 16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 17 | #include <linux/gpio.h> | ||
| 18 | #include <linux/regulator/machine.h> | 17 | #include <linux/regulator/machine.h> |
| 19 | #include <linux/regulator/max8649.h> | 18 | #include <linux/regulator/max8649.h> |
| 20 | #include <linux/mfd/max8925.h> | 19 | #include <linux/mfd/max8925.h> |