diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-08-20 21:58:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-08-20 21:58:59 +0000 |
| commit | 892bf98f0c04e9297979936d973c85e62a3f0b96 (patch) | |
| tree | 3f9570013732b9472502e71b25d5a76591eaed9a /drivers | |
| parent | d4339ea6c6ab0bdf909d587bd9c5a754e362833d (diff) | |
More MIPS64 chainsawing.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/Makefile | 2 | ||||
| -rw-r--r-- | drivers/block/ll_rw_blk.c | 4 | ||||
| -rw-r--r-- | drivers/char/Config.in | 2 | ||||
| -rw-r--r-- | drivers/char/misc.c | 2 | ||||
| -rw-r--r-- | drivers/char/vt.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/wd33c93.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/wd33c93.h | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 58af28821..51ad67441 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -57,7 +57,7 @@ else endif endif -ifdef CONFIG_SGI +ifdef CONFIG_SGI_IP22 SUB_DIRS += sgi MOD_SUB_DIRS += sgi endif diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c index 02df81f77..baab892ef 100644 --- a/drivers/block/ll_rw_blk.c +++ b/drivers/block/ll_rw_blk.c @@ -787,8 +787,8 @@ __initfunc(int blk_dev_init(void)) #ifdef CONFIG_BLK_DEV_FD floppy_init(); #else -#if !defined(CONFIG_SGI) && !defined (__mc68000__) && !defined(CONFIG_PMAC) \ - && !defined(__sparc__) && !defined(CONFIG_APUS) \ +#if !defined(CONFIG_SGI_IP22) && !defined (__mc68000__) && \ + !defined(CONFIG_PMAC) && !defined(__sparc__) && !defined(CONFIG_APUS) \ && !defined(CONFIG_DECSTATION) && !defined(CONFIG_BAGET_MIPS) outb_p(0xc, 0x3f2); #endif diff --git a/drivers/char/Config.in b/drivers/char/Config.in index 6c9f0a651..250802a51 100644 --- a/drivers/char/Config.in +++ b/drivers/char/Config.in @@ -137,7 +137,7 @@ if [ "$CONFIG_VIDEO_DEV" != "n" ]; then dep_tristate 'Colour QuickCam Video For Linux (EXPERIMENTAL)' CONFIG_VIDEO_CQCAM $CONFIG_VIDEO_DEV $CONFIG_PARPORT fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - if [ "$CONFIG_SGI" = "y" ]; then + if [ "$CONFIG_SGI_IP22" = "y" ]; then dep_tristate 'SGI Vino Video For Linux (EXPERIMENTAL)' CONFIG_VIDEO_VINO $CONFIG_VIDEO_DEV fi fi diff --git a/drivers/char/misc.c b/drivers/char/misc.c index 9b5b5fc20..024706dc6 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c @@ -281,7 +281,7 @@ int __init misc_init(void) #ifdef CONFIG_SGI_NEWPORT_GFX gfx_register (); #endif -#ifdef CONFIG_SGI +#ifdef CONFIG_SGI_IP22 streamable_init (); #endif if (register_chrdev(MISC_MAJOR,"misc",&misc_fops)) { diff --git a/drivers/char/vt.c b/drivers/char/vt.c index b7f51e2f3..1bb5120cd 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c @@ -89,7 +89,7 @@ unsigned int video_scan_lines; */ #if defined(__i386__) || defined(__alpha__) || defined(__powerpc__) \ - || (defined(__mips__) && !defined(CONFIG_SGI)) + || (defined(__mips__) && !defined(CONFIG_SGI_IP22)) static void kd_nosound(unsigned long ignored) diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c index 2f75c1bf3..3cb968060 100644 --- a/drivers/scsi/wd33c93.c +++ b/drivers/scsi/wd33c93.c @@ -1359,7 +1359,7 @@ uchar sr; hostdata = (struct WD33C93_hostdata *)instance->hostdata; regp = hostdata->regp; -#ifdef CONFIG_SGI +#ifdef CONFIG_SGI_IP22 { int busycount = 0; extern void sgiwd93_reset(uchar*); diff --git a/drivers/scsi/wd33c93.h b/drivers/scsi/wd33c93.h index 0a49ce982..a6b094701 100644 --- a/drivers/scsi/wd33c93.h +++ b/drivers/scsi/wd33c93.h @@ -190,7 +190,7 @@ typedef struct { volatile unsigned char SASR; char pad; -#ifdef CONFIG_SGI +#ifdef CONFIG_SGI_IP22 char pad2,pad3; #endif volatile unsigned char SCMD; |