diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-18 03:30:58 +0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-18 03:30:58 +0400 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /arch/arm/mach-ixp2000/ixdp2x01.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
| download | linux-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.tar.xz | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'arch/arm/mach-ixp2000/ixdp2x01.c')
| -rw-r--r-- | arch/arm/mach-ixp2000/ixdp2x01.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c index 4a12327a09a3..0369ec4242a6 100644 --- a/arch/arm/mach-ixp2000/ixdp2x01.c +++ b/arch/arm/mach-ixp2000/ixdp2x01.c @@ -23,7 +23,6 @@ #include <linux/bitops.h> #include <linux/pci.h> #include <linux/ioport.h> -#include <linux/slab.h> #include <linux/delay.h> #include <linux/serial.h> #include <linux/tty.h> |