diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
| commit | 3797ba0b62debb71af4606910acacc9896a9ae3b (patch) | |
| tree | 414eea76253c7871bfdf3bd9d1817771eb40917c /init/main.c | |
| parent | 2b6c0c580795a4404f72d2a794214dd9e080709d (diff) | |
Merge with Linux 2.4.0-test2.
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index c9fb91dd5..e8d8f0d99 100644 --- a/init/main.c +++ b/init/main.c @@ -98,7 +98,6 @@ extern void signals_init(void); extern void bdev_init(void); extern int init_pcmcia_ds(void); extern int usb_init(void); -extern void filelock_init(void); extern void free_initmem(void); extern void filesystem_setup(void); @@ -243,6 +242,25 @@ static struct dev_name_struct { { "dasdg", (DASD_MAJOR << MINORBITS) + (6 << 2) }, { "dasdh", (DASD_MAJOR << MINORBITS) + (7 << 2) }, #endif +#if defined(CONFIG_BLK_CPQ_DA) || defined(CONFIG_BLK_CPQ_DA_MODULE) + { "ida/c0d0p",0x4800 }, + { "ida/c0d1p",0x4810 }, + { "ida/c0d2p",0x4820 }, + { "ida/c0d3p",0x4830 }, + { "ida/c0d4p",0x4840 }, + { "ida/c0d5p",0x4850 }, + { "ida/c0d6p",0x4860 }, + { "ida/c0d7p",0x4870 }, + { "ida/c0d8p",0x4880 }, + { "ida/c0d9p",0x4890 }, + { "ida/c0d10p",0x48A0 }, + { "ida/c0d11p",0x48B0 }, + { "ida/c0d12p",0x48C0 }, + { "ida/c0d13p",0x48D0 }, + { "ida/c0d14p",0x48E0 }, + { "ida/c0d15p",0x48F0 }, +#endif + { NULL, 0 } }; @@ -563,7 +581,6 @@ asmlinkage void __init start_kernel(void) bdev_init(); inode_init(mempages); file_table_init(); - filelock_init(); #if defined(CONFIG_SYSVIPC) ipc_init(); #endif |