diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /drivers/char/mac_SCC.c | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'drivers/char/mac_SCC.c')
| -rw-r--r-- | drivers/char/mac_SCC.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/char/mac_SCC.c b/drivers/char/mac_SCC.c index 0295ab4b4..159a8336e 100644 --- a/drivers/char/mac_SCC.c +++ b/drivers/char/mac_SCC.c @@ -67,6 +67,7 @@ #include <asm/system.h> #include <asm/segment.h> #include <asm/bitops.h> +#include <asm/hwtest.h> #include "mac_SCC.h" @@ -1300,6 +1301,12 @@ static void probe_sccs(void) /* testing: fix up broken 24 bit addresses (ClassicII) */ if ((mac_bi_data.sccbase & 0x00FFFFFF) == mac_bi_data.sccbase) mac_bi_data.sccbase |= 0x50000000; + + if ( !hwreg_present((void *)mac_bi_data.sccbase)) + { + printk(KERN_WARNING "z8530: Serial devices not accessible. Check serial switch.\n"); + return; + } for(n=0;n<2;n++) { @@ -1459,11 +1466,7 @@ int mac_SCC_init(void) printk("Mac68K Z8530 serial driver version 1.01\n"); /* SCC present at all? */ - if (MACH_IS_ATARI || MACH_IS_AMIGA -#if 0 - || !(MACHW_PRESENT(SCC) || MACHW_PRESENT(ST_ESCC)) -#endif - ) + if (!MACH_IS_MAC) return( -ENODEV ); if (zs_chain == 0) |