diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-03 15:07:10 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-03 15:07:10 -0700 |
commit | 34bac238cc13cdb57f3b353b6e5ed3eae2cff158 (patch) | |
tree | 3fff52deec8671a5599bde9e711f166a7c92d693 /arch/sh/boards/renesas/rts7751r2d | |
parent | 247284481ca40288bd120cf0707681c3bdbee78f (diff) | |
parent | cc6f33db30c4fcf7915270619e81a91d6190b6c8 (diff) | |
download | op-kernel-dev-34bac238cc13cdb57f3b353b6e5ed3eae2cff158.zip op-kernel-dev-34bac238cc13cdb57f3b353b6e5ed3eae2cff158.tar.gz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23:
sh: fix defconfigs for sh7751r boards
sh: fix cf support on r2d boards
sh: update r2d defconfig
sh: update snapgear defconfig.
sh: Fix SH-X3 FPU exception handling.
sh: Fix pgd mismatch from cached TTB in unhandled fault.
sh: Don't include fault-nommu on SH-2/SH-2A.
sh: Fix irqflags tracing for SH-3/4 nommu.
sh: Fix lockdep debugging oops on SH-3/4.
Diffstat (limited to 'arch/sh/boards/renesas/rts7751r2d')
-rw-r--r-- | arch/sh/boards/renesas/rts7751r2d/setup.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/sh/boards/renesas/rts7751r2d/setup.c b/arch/sh/boards/renesas/rts7751r2d/setup.c index e165d85..6f7029d 100644 --- a/arch/sh/boards/renesas/rts7751r2d/setup.c +++ b/arch/sh/boards/renesas/rts7751r2d/setup.c @@ -140,12 +140,19 @@ static struct platform_device sm501_device = { static struct platform_device *rts7751r2d_devices[] __initdata = { &uart_device, &heartbeat_device, - &cf_ide_device, &sm501_device, }; static int __init rts7751r2d_devices_setup(void) { + int ret; + + if (ctrl_inw(PA_BVERREG) == 0x10) { /* only working on R2D-PLUS */ + ret = platform_device_register(&cf_ide_device); + if (ret) + return ret; + } + return platform_add_devices(rts7751r2d_devices, ARRAY_SIZE(rts7751r2d_devices)); } |