diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 18:24:04 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 18:24:04 +0200 |
commit | ac1d426e825ab5778995f2f6f053ca2e6b45c622 (patch) | |
tree | 75b91356ca39463e0112931aa6790802fb1e07a2 /arch/mips/pmc-sierra/yosemite/irq.c | |
parent | Merge branch 'devel-pmu' into devel (diff) | |
parent | Merge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into devel-s... (diff) | |
download | linux-ac1d426e825ab5778995f2f6f053ca2e6b45c622.tar.xz linux-ac1d426e825ab5778995f2f6f053ca2e6b45c622.zip |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/mips/pmc-sierra/yosemite/irq.c')
-rw-r--r-- | arch/mips/pmc-sierra/yosemite/irq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/pmc-sierra/yosemite/irq.c b/arch/mips/pmc-sierra/yosemite/irq.c index 5f673eba142c..51021cfd04bc 100644 --- a/arch/mips/pmc-sierra/yosemite/irq.c +++ b/arch/mips/pmc-sierra/yosemite/irq.c @@ -37,7 +37,6 @@ #include <linux/ioport.h> #include <linux/irq.h> #include <linux/timex.h> -#include <linux/slab.h> #include <linux/random.h> #include <linux/bitops.h> #include <asm/bootinfo.h> |