diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /arch/arm/mach-ixp4xx/gtwx5715-setup.c | |
| parent | e182c77cc291456eed127b1472952ddb59a81a9d (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'arch/arm/mach-ixp4xx/gtwx5715-setup.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/gtwx5715-setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/gtwx5715-setup.c b/arch/arm/mach-ixp4xx/gtwx5715-setup.c index 0bc7185cb6f7..c67586b79400 100644 --- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c +++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/serial.h> | 27 | #include <linux/serial.h> |
| 28 | #include <linux/tty.h> | 28 | #include <linux/tty.h> |
| 29 | #include <linux/serial_8250.h> | 29 | #include <linux/serial_8250.h> |
| 30 | #include <linux/slab.h> | ||
| 31 | #include <asm/types.h> | 30 | #include <asm/types.h> |
| 32 | #include <asm/setup.h> | 31 | #include <asm/setup.h> |
| 33 | #include <asm/memory.h> | 32 | #include <asm/memory.h> |