diff options
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/Kconfig | 4 | ||||
-rw-r--r-- | drivers/char/mxser.c | 1 | ||||
-rw-r--r-- | drivers/char/rtc.c | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index df5f2b0e0750..a1de06d76de6 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
@@ -175,7 +175,7 @@ config MOXA_INTELLIO | |||
175 | 175 | ||
176 | config MOXA_SMARTIO | 176 | config MOXA_SMARTIO |
177 | tristate "Moxa SmartIO support" | 177 | tristate "Moxa SmartIO support" |
178 | depends on SERIAL_NONSTANDARD && (BROKEN || !SPARC32) | 178 | depends on SERIAL_NONSTANDARD |
179 | help | 179 | help |
180 | Say Y here if you have a Moxa SmartIO multiport serial card. | 180 | Say Y here if you have a Moxa SmartIO multiport serial card. |
181 | 181 | ||
@@ -735,7 +735,7 @@ config SGI_IP27_RTC | |||
735 | 735 | ||
736 | config GEN_RTC | 736 | config GEN_RTC |
737 | tristate "Generic /dev/rtc emulation" | 737 | tristate "Generic /dev/rtc emulation" |
738 | depends on RTC!=y && !IA64 && !ARM && !PPC64 && !M32R && !SPARC32 | 738 | depends on RTC!=y && !IA64 && !ARM && !PPC64 && !M32R && !SPARC32 && !SPARC64 |
739 | ---help--- | 739 | ---help--- |
740 | If you say Y here and create a character special file /dev/rtc with | 740 | If you say Y here and create a character special file /dev/rtc with |
741 | major number 10 and minor number 135 using mknod ("man mknod"), you | 741 | major number 10 and minor number 135 using mknod ("man mknod"), you |
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c index f022f0944434..d0ef1ae41298 100644 --- a/drivers/char/mxser.c +++ b/drivers/char/mxser.c | |||
@@ -63,7 +63,6 @@ | |||
63 | #include <asm/system.h> | 63 | #include <asm/system.h> |
64 | #include <asm/io.h> | 64 | #include <asm/io.h> |
65 | #include <asm/irq.h> | 65 | #include <asm/irq.h> |
66 | #include <asm/segment.h> | ||
67 | #include <asm/bitops.h> | 66 | #include <asm/bitops.h> |
68 | #include <asm/uaccess.h> | 67 | #include <asm/uaccess.h> |
69 | 68 | ||
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index cd4fe8b1709f..63fff7c1244a 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c | |||
@@ -938,10 +938,9 @@ found: | |||
938 | 938 | ||
939 | /* | 939 | /* |
940 | * XXX Interrupt pin #7 in Espresso is shared between RTC and | 940 | * XXX Interrupt pin #7 in Espresso is shared between RTC and |
941 | * PCI Slot 2 INTA# (and some INTx# in Slot 1). SA_INTERRUPT here | 941 | * PCI Slot 2 INTA# (and some INTx# in Slot 1). |
942 | * is asking for trouble with add-on boards. Change to SA_SHIRQ. | ||
943 | */ | 942 | */ |
944 | if (request_irq(rtc_irq, rtc_interrupt, SA_INTERRUPT, "rtc", (void *)&rtc_port)) { | 943 | if (request_irq(rtc_irq, rtc_interrupt, SA_SHIRQ, "rtc", (void *)&rtc_port)) { |
945 | /* | 944 | /* |
946 | * Standard way for sparc to print irq's is to use | 945 | * Standard way for sparc to print irq's is to use |
947 | * __irq_itoa(). I think for EBus it's ok to use %d. | 946 | * __irq_itoa(). I think for EBus it's ok to use %d. |