diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-03 01:07:40 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-03 01:07:40 +0300 |
| commit | c5b84b3bb0c055d70dc9f1b5e900378bc9d059ea (patch) | |
| tree | bd5b0b4efb552bacd812f9e6e08a29bae70c0da1 /arch/arm/mach-pxa/clock.c | |
| parent | d281bc9d8a22419abc254f86a7fc268bb99914e1 (diff) | |
| parent | bc2fd1c09c226ea47ab8301cde6dbcf9e5c78b73 (diff) | |
| download | linux-c5b84b3bb0c055d70dc9f1b5e900378bc9d059ea.tar.xz | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Conflicts:
arch/arm/mach-pxa/pxa25x.c
Diffstat (limited to 'arch/arm/mach-pxa/clock.c')
| -rw-r--r-- | arch/arm/mach-pxa/clock.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/clock.c b/arch/arm/mach-pxa/clock.c index a3e0e1989a6b..40b774084514 100644 --- a/arch/arm/mach-pxa/clock.c +++ b/arch/arm/mach-pxa/clock.c @@ -14,7 +14,6 @@ #include <asm/clkdev.h> #include <mach/pxa2xx-regs.h> -#include <mach/pxa2xx-gpio.h> #include <mach/hardware.h> #include "devices.h" |