diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 09:07:15 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 09:07:15 -0700 |
commit | 0d43f5123d1456669b3bbc69854faf6fd5b14caa (patch) | |
tree | e69d4418d579e55a004c2263ac49a46aac161a54 /arch/sh/boards/mach-rsk/devices-rsk7203.c | |
parent | fb3165b59f9ce510fed07262db20fdb799f88fa6 (diff) | |
parent | ffb4a73d8906f71910e6c83ec2b499e70025ee8e (diff) | |
download | linux-rt-0d43f5123d1456669b3bbc69854faf6fd5b14caa.tar.gz |
Merge branch 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fix hugetlbfs dependencies for SH-3 && MMU configurations.
sh: Document uImage.bin target in archhelp.
sh: add uImage.bin target
sh: rsk7203 CONFIG_MTD=n fix
sh: Check for return_to_handler when unwinding the stack
sh: Build fix: define more __movmem* symbols
sh: __irq_entry annotate do_IRQ().
Fix up sh/powerpc conflicts in fs/Kconfig
Diffstat (limited to 'arch/sh/boards/mach-rsk/devices-rsk7203.c')
-rw-r--r-- | arch/sh/boards/mach-rsk/devices-rsk7203.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/sh/boards/mach-rsk/devices-rsk7203.c b/arch/sh/boards/mach-rsk/devices-rsk7203.c index 4af3a771c058..c37617e63220 100644 --- a/arch/sh/boards/mach-rsk/devices-rsk7203.c +++ b/arch/sh/boards/mach-rsk/devices-rsk7203.c @@ -11,10 +11,6 @@ #include <linux/types.h> #include <linux/platform_device.h> #include <linux/interrupt.h> -#include <linux/mtd/mtd.h> -#include <linux/mtd/partitions.h> -#include <linux/mtd/physmap.h> -#include <linux/mtd/map.h> #include <linux/smsc911x.h> #include <linux/gpio.h> #include <linux/leds.h> |