diff options
| author |   Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2007-01-28 23:31:08 +0100 |
|---|---|---|
| committer |   Kumar Gala <galak@kernel.crashing.org> | 2007-02-09 11:41:18 -0600 |
| commit | 8500adc79b15fa85b403dbf04aba3497c1f80e50 (patch) | |
| tree | f47ae031d448ced4906a5145318c86a9b72cbda2 /arch/powerpc/platforms/embedded6xx/linkstation.c | |
| parent | Merge branch '83xx' into for_paulus (diff) | |
| download | linux-dev-8500adc79b15fa85b403dbf04aba3497c1f80e50.tar.xz linux-dev-8500adc79b15fa85b403dbf04aba3497c1f80e50.zip | |
[POWERPC] Update to linkstation / kurobox support
Linkstation systems capable of running mainline kernels use u-boot as a
bootloader, so, specifying a suitable kernel command is not a problem.
Don't guess. Also extend linkstation_defconfig to support the linkstation HS
model with a IT8212 IDE controller and kuroboxHD/HD-HLAN linkstation
models with a tulip ethernet chip. The latter also require a slightly
different .dts file, which is also included with this patch.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/embedded6xx/linkstation.c')
| -rw-r--r-- | arch/powerpc/platforms/embedded6xx/linkstation.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c index 61599d919ea8..3f6c4114f908 100644 --- a/arch/powerpc/platforms/embedded6xx/linkstation.c +++ b/arch/powerpc/platforms/embedded6xx/linkstation.c @@ -13,7 +13,6 @@ #include <linux/kernel.h> #include <linux/pci.h> #include <linux/initrd.h> -#include <linux/root_dev.h> #include <linux/mtd/physmap.h> #include <asm/time.h> @@ -91,17 +90,6 @@ static void __init linkstation_setup_arch(void) ARRAY_SIZE(linkstation_physmap_partitions)); #endif -#ifdef CONFIG_BLK_DEV_INITRD - if (initrd_start) - ROOT_DEV = Root_RAM0; - else -#endif -#ifdef CONFIG_ROOT_NFS - ROOT_DEV = Root_NFS; -#else - ROOT_DEV = Root_HDA1; -#endif - /* Lookup PCI host bridges */ for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) add_bridge(np); |