diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-09 15:35:53 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-09 15:35:53 -0500 |
| commit | 263a5c8e16c34199ddf6de3f102e789ffa3ee26e (patch) | |
| tree | 4f049e339d522b2ab0ba3bed3ec217e4bbc83d35 /arch/arm/mach-pxa/pxa27x.c | |
| parent | 54d20f006ceff1f2f1e69d0e54049b6c0765c039 (diff) | |
| parent | 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d (diff) | |
Merge 3.3-rc6 into driver-core-next
This was done to resolve a conflict in the drivers/base/cpu.c file.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-pxa/pxa27x.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index aed6cbcf3866..c1673b3441d4 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | #include <linux/irq.h> | 23 | #include <linux/irq.h> |
| 24 | #include <linux/i2c/pxa-i2c.h> | 24 | #include <linux/i2c/pxa-i2c.h> |
| 25 | #include <linux/gpio.h> | ||
| 26 | 25 | ||
| 27 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
| 28 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |