diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
| commit | 353816f43d1fb340ff2d9a911dd5d0799c09f6a5 (patch) | |
| tree | 517290fd884d286fe2971137ac89f89e3567785a /arch/arm/mach-pxa/zylonite.c | |
| parent | 160bbab3000dafccbe43688e48208cecf4deb879 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'arch/arm/mach-pxa/zylonite.c')
| -rw-r--r-- | arch/arm/mach-pxa/zylonite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c index 813804433466..218d2001f1df 100644 --- a/arch/arm/mach-pxa/zylonite.c +++ b/arch/arm/mach-pxa/zylonite.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/gpio.h> | ||
| 21 | #include <linux/pwm_backlight.h> | 22 | #include <linux/pwm_backlight.h> |
| 22 | #include <linux/smc91x.h> | 23 | #include <linux/smc91x.h> |
| 23 | 24 | ||
| @@ -25,7 +26,6 @@ | |||
| 25 | #include <asm/mach/arch.h> | 26 | #include <asm/mach/arch.h> |
| 26 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
| 27 | #include <mach/audio.h> | 28 | #include <mach/audio.h> |
| 28 | #include <mach/gpio.h> | ||
| 29 | #include <mach/pxafb.h> | 29 | #include <mach/pxafb.h> |
| 30 | #include <mach/zylonite.h> | 30 | #include <mach/zylonite.h> |
| 31 | #include <mach/mmc.h> | 31 | #include <mach/mmc.h> |