diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-09-28 12:30:21 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-09-28 12:30:21 -0400 |
| commit | ac2a8bca03a6d281c78e803899001e22a92b92e9 (patch) | |
| tree | 5969d5e812165a2b113601109833e8bd2e662d71 /arch/arm/mach-pxa | |
| parent | a6a1cf3d963daaf80e467793060be1fa57599a4b (diff) | |
| parent | 3c6e8d05d60d8106b5cdc730cf220b2a4b521b66 (diff) | |
Merge branch 'ib-move-htc-egpio' into devel
Diffstat (limited to 'arch/arm/mach-pxa')
| -rw-r--r-- | arch/arm/mach-pxa/hx4700.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/magician.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c index 4a2f9aba93ea..66184f5cbe40 100644 --- a/arch/arm/mach-pxa/hx4700.c +++ b/arch/arm/mach-pxa/hx4700.c | |||
| @@ -24,10 +24,10 @@ | |||
| 24 | #include <linux/input.h> | 24 | #include <linux/input.h> |
| 25 | #include <linux/input/navpoint.h> | 25 | #include <linux/input/navpoint.h> |
| 26 | #include <linux/lcd.h> | 26 | #include <linux/lcd.h> |
| 27 | #include <linux/mfd/htc-egpio.h> | ||
| 28 | #include <linux/mfd/asic3.h> | 27 | #include <linux/mfd/asic3.h> |
| 29 | #include <linux/mtd/physmap.h> | 28 | #include <linux/mtd/physmap.h> |
| 30 | #include <linux/pda_power.h> | 29 | #include <linux/pda_power.h> |
| 30 | #include <linux/platform_data/gpio-htc-egpio.h> | ||
| 31 | #include <linux/pwm.h> | 31 | #include <linux/pwm.h> |
| 32 | #include <linux/pwm_backlight.h> | 32 | #include <linux/pwm_backlight.h> |
| 33 | #include <linux/regulator/driver.h> | 33 | #include <linux/regulator/driver.h> |
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index abc918169367..265f48be32c1 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c | |||
| @@ -20,10 +20,10 @@ | |||
| 20 | #include <linux/gpio.h> | 20 | #include <linux/gpio.h> |
| 21 | #include <linux/gpio_keys.h> | 21 | #include <linux/gpio_keys.h> |
| 22 | #include <linux/input.h> | 22 | #include <linux/input.h> |
| 23 | #include <linux/mfd/htc-egpio.h> | ||
| 24 | #include <linux/mfd/htc-pasic3.h> | 23 | #include <linux/mfd/htc-pasic3.h> |
| 25 | #include <linux/mtd/physmap.h> | 24 | #include <linux/mtd/physmap.h> |
| 26 | #include <linux/pda_power.h> | 25 | #include <linux/pda_power.h> |
| 26 | #include <linux/platform_data/gpio-htc-egpio.h> | ||
| 27 | #include <linux/pwm.h> | 27 | #include <linux/pwm.h> |
| 28 | #include <linux/pwm_backlight.h> | 28 | #include <linux/pwm_backlight.h> |
| 29 | #include <linux/regulator/driver.h> | 29 | #include <linux/regulator/driver.h> |