diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-13 09:28:45 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 09:28:45 +0200 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /arch/arm/mach-ixp2000/ixdp2800.c | |
| parent | sparc64: Fix memory leak in pci_register_iommu_region(). (diff) | |
| parent | Linux 2.6.34-rc4 (diff) | |
| download | linux-9343af084c7e8911897b0883042ee690cee3aaef.tar.xz linux-9343af084c7e8911897b0883042ee690cee3aaef.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'arch/arm/mach-ixp2000/ixdp2800.c')
| -rw-r--r-- | arch/arm/mach-ixp2000/ixdp2800.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2800.c b/arch/arm/mach-ixp2000/ixdp2800.c index 94f68ba9ea50..237b61a85e9a 100644 --- a/arch/arm/mach-ixp2000/ixdp2800.c +++ b/arch/arm/mach-ixp2000/ixdp2800.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/io.h> |