diff options
| author | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-07-02 06:26:51 +0000 |
|---|---|---|
| committer | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-07-02 06:26:51 +0000 |
| commit | 6523f1a4aea31cc4823f5b80da3f18d407a7a19d (patch) | |
| tree | fc4eb49a1b9312988e9adef58d436f2a0e11ea7b /drivers | |
| parent | aa2e5b3c38f27ee5efda70e68be0ccff9c334f9b (diff) | |
New CONFIG_SGI_GRAPHICS turns on the new devices.
And remaining files from previous commit.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/Makefile | 4 | ||||
| -rw-r--r-- | drivers/char/misc.c | 6 | ||||
| -rw-r--r-- | drivers/sgi/Makefile | 2 | ||||
| -rw-r--r-- | drivers/sgi/char/Makefile | 2 |
4 files changed, 12 insertions, 2 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 900cb935f..14efcf554 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -210,6 +210,10 @@ else endif endif +ifdef CONFIG_SGI_GRAPHICS +M = y +endif + ifdef CONFIG_SUN_MOUSE M = y endif diff --git a/drivers/char/misc.c b/drivers/char/misc.c index ed06f6314..90ff2026f 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c @@ -69,6 +69,8 @@ extern int atixl_busmouse_init(void); extern int amiga_mouse_init(void); extern int atari_mouse_init(void); extern int sun_mouse_init(void); +extern void gfx_register(void); +extern void streamable_init(void); extern void watchdog_init(void); extern void wdt_init(void); extern void pcwatchdog_init(void); @@ -239,6 +241,10 @@ __initfunc(int misc_init(void)) #ifdef CONFIG_ATARI_DSP56K dsp56k_init(); #endif +#ifdef CONFIG_SGI_GRAPHICS + gfx_register (); + streamable_init (); +#endif #endif /* !MODULE */ if (register_chrdev(MISC_MAJOR,"misc",&misc_fops)) { printk("unable to get major %d for misc devices\n", diff --git a/drivers/sgi/Makefile b/drivers/sgi/Makefile index 40cb89eaa..466e477ca 100644 --- a/drivers/sgi/Makefile +++ b/drivers/sgi/Makefile @@ -17,6 +17,6 @@ L_TARGET := sgi.a # Character devices for SGI machines. # SUB_DIRS += char -L_OBJS += char/sgichar.o +L_OBJS += char/sgichar.o include $(TOPDIR)/Rules.make diff --git a/drivers/sgi/char/Makefile b/drivers/sgi/char/Makefile index 99440bd60..8877d3996 100644 --- a/drivers/sgi/char/Makefile +++ b/drivers/sgi/char/Makefile @@ -8,7 +8,7 @@ # Note 2! The CFLAGS definitions are now in the main makefile... O_TARGET := sgichar.o -O_OBJS := newport.o sgicons.o +O_OBJS := graphics.o streamable.o newport.o cons_newport.o sgicons.o vga_font.o ifeq ($(CONFIG_SGI_SERIAL),y) O_OBJS += sgiserial.o |