diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-08 21:33:44 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-08 21:33:44 +0400 |
| commit | 990b07d952bff7116ba79e3c4ceeae5dd8d5ec3d (patch) | |
| tree | b0f6c896749f5beca20d74e72e4761aaa9e8ad2b /arch/arm/mach-mmp | |
| parent | 3a70b7e05f62d4e1bfd5744368ea1fd855b6e03c (diff) | |
| parent | 8a16a701ad787b6db2949766341c5ad1b551de9f (diff) | |
| download | linux-990b07d952bff7116ba79e3c4ceeae5dd8d5ec3d.tar.xz | |
Merge branch 'regulator' of git://github.com/hzhuang1/linux into next/drivers
* 'regulator' of git://github.com/hzhuang1/linux: (2 commits)
regulator: Remove bq24022 regulator driver
pxa: magician/hx4700: Convert to gpio-regulator from bq24022
(plus update to v3.3-rc6)
Diffstat (limited to 'arch/arm/mach-mmp')
| -rw-r--r-- | arch/arm/mach-mmp/aspenite.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mmp/pxa168.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mmp/tavorevb.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c index 17cb76060125..3588a5584153 100644 --- a/arch/arm/mach-mmp/aspenite.c +++ b/arch/arm/mach-mmp/aspenite.c @@ -17,7 +17,6 @@ #include <linux/mtd/partitions.h> #include <linux/mtd/nand.h> #include <linux/interrupt.h> -#include <linux/gpio.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> diff --git a/arch/arm/mach-mmp/pxa168.c b/arch/arm/mach-mmp/pxa168.c index 7bc17eaa12eb..ada1213982b4 100644 --- a/arch/arm/mach-mmp/pxa168.c +++ b/arch/arm/mach-mmp/pxa168.c @@ -24,7 +24,6 @@ #include <mach/dma.h> #include <mach/devices.h> #include <mach/mfp.h> -#include <linux/platform_device.h> #include <linux/dma-mapping.h> #include <mach/pxa168.h> diff --git a/arch/arm/mach-mmp/tavorevb.c b/arch/arm/mach-mmp/tavorevb.c index 8e3b5af04a57..bc97170125bf 100644 --- a/arch/arm/mach-mmp/tavorevb.c +++ b/arch/arm/mach-mmp/tavorevb.c @@ -12,7 +12,6 @@ #include <linux/kernel.h> #include <linux/platform_device.h> #include <linux/smc91x.h> -#include <linux/gpio.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> |