diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-13 09:50:26 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-13 09:50:26 -0700 |
commit | ecaedfa385a6df297e17d6e9f296cc63f12c053f (patch) | |
tree | 236a4484cdb04f73f8f365ae46a1741eb0d9ce54 /arch/sh64/mm/init.c | |
parent | dcf397f037f52add9945eced57ca300ab6a4413c (diff) | |
parent | cb0f3fe08d4718cfe6cf7b50d0fb2732e5e5459d (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh64-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh64-2.6:
sh64: mach-cayman: Build fixes.
sh64: Symbol export fixups.
sh64: linker script tidying and alignment fixups.
sh64: Set KBUILD_IMAGE to make the rpm target happy.
sh64: Kill off obsolete linux/blk.h reference.
sh64: cleanup struct irqaction initializers.
sh64: Kill off dead gdb stub symbol.
sh64: alphanumeric display only on Cayman.
sh64: Add defconfigs for mach-sim and mach-harp.
sh64: update cayman defconfig.
sh64: Tidy up Kconfig dependencies.
sh64: Move consistent DMA routines to arch/sh64/mm/.
sh64: Some symbol exports and build fixes.
sh64: mach-sim: Build fixes.
sh64: mach-harp: Build fixes.
sh64: Kill off duplicate frame pointer option.
sh64: Kill off dead ROM-RAM and generic boards.
sh64: Tidy up includes for Cayman board.
sh64: Move *_p() I/O routine variants to io.h.
Diffstat (limited to 'arch/sh64/mm/init.c')
-rw-r--r-- | arch/sh64/mm/init.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/sh64/mm/init.c b/arch/sh64/mm/init.c index 559717f30d1..21cf42de23e 100644 --- a/arch/sh64/mm/init.c +++ b/arch/sh64/mm/init.c @@ -22,10 +22,6 @@ #include <asm/pgtable.h> #include <asm/tlb.h> -#ifdef CONFIG_BLK_DEV_INITRD -#include <linux/blk.h> -#endif - DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); /* |