diff options
| author | Alex deVries <Alex.deVries@windriver.com> | 1999-02-06 03:57:37 +0000 |
|---|---|---|
| committer | Alex deVries <Alex.deVries@windriver.com> | 1999-02-06 03:57:37 +0000 |
| commit | 2f7a646bdb098918bf1d541b2fe63c7a9a89192f (patch) | |
| tree | b401efc2464f8cced8c885f8e08cf7477b2559e1 /drivers/char/misc.c | |
| parent | 7612165ef628025903698bcb33b7140c576f2963 (diff) | |
- fixed compiling in of ramdisks; we don't have the kernel segment defining initrd offset, etc.
- a couple of HAL related changes to make it build better
- the start of making newport graphics a module; currently this breaks as a
module, but works okay built into the kernel.
- Alex
Diffstat (limited to 'drivers/char/misc.c')
| -rw-r--r-- | drivers/char/misc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/char/misc.c b/drivers/char/misc.c index a961a1a4d..d449cf226 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c @@ -72,7 +72,9 @@ extern int amiga_mouse_init(void); extern int atari_mouse_init(void); extern int sun_mouse_init(void); extern int adb_mouse_init(void); +#ifdef CONFIG_SGI_NEWPORT_GFX extern void gfx_register(void); +#endif extern void streamable_init(void); extern void watchdog_init(void); extern void wdt_init(void); @@ -278,10 +280,10 @@ int __init misc_init(void) #ifdef CONFIG_PMAC_PBOOK pmu_device_init(); #endif -#ifdef CONFIG_SGI_GRAPHICS +#ifdef CONFIG_SGI_NEWPORT_GFX gfx_register (); - streamable_init (); #endif + streamable_init (); if (register_chrdev(MISC_MAJOR,"misc",&misc_fops)) { printk("unable to get major %d for misc devices\n", MISC_MAJOR); |