diff options
| author | viro@ZenIV.linux.org.uk <viro@ZenIV.linux.org.uk> | 2005-09-09 12:02:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 13:31:58 -0400 |
| commit | f91f4d923f4039bf3460eca299ed5a3f7ecd7b96 (patch) | |
| tree | 81ceb67d21b4779ab82651d16778122a2a45d531 /drivers/char | |
| parent | d310a35a487388859432648daa2ea4fc5e51c049 (diff) | |
[PATCH] gratuitous includes of asm/serial.h
Removed gratuitous includes of asm/serial.h in synklinkmp and ip2main.
Allows to remove the rest of "broken on sparc32" in drivers/char - this
stuff doesn't break the build anymore. Since it got zero testing, it almost
certainly won't work there, though...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/char/ip2main.c | 1 | ||||
| -rw-r--r-- | drivers/char/synclinkmp.c | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 2bc9d64db106..c29365d5b524 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
| @@ -80,7 +80,7 @@ config SERIAL_NONSTANDARD | |||
| 80 | 80 | ||
| 81 | config COMPUTONE | 81 | config COMPUTONE |
| 82 | tristate "Computone IntelliPort Plus serial support" | 82 | tristate "Computone IntelliPort Plus serial support" |
| 83 | depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (BROKEN || !SPARC32) | 83 | depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP |
| 84 | ---help--- | 84 | ---help--- |
| 85 | This driver supports the entire family of Intelliport II/Plus | 85 | This driver supports the entire family of Intelliport II/Plus |
| 86 | controllers with the exception of the MicroChannel controllers and | 86 | controllers with the exception of the MicroChannel controllers and |
| @@ -208,7 +208,7 @@ config SYNCLINK | |||
| 208 | 208 | ||
| 209 | config SYNCLINKMP | 209 | config SYNCLINKMP |
| 210 | tristate "SyncLink Multiport support" | 210 | tristate "SyncLink Multiport support" |
| 211 | depends on SERIAL_NONSTANDARD && (BROKEN || !SPARC32) | 211 | depends on SERIAL_NONSTANDARD |
| 212 | help | 212 | help |
| 213 | Enable support for the SyncLink Multiport (2 or 4 ports) | 213 | Enable support for the SyncLink Multiport (2 or 4 ports) |
| 214 | serial adapter, running asynchronous and HDLC communications up | 214 | serial adapter, running asynchronous and HDLC communications up |
diff --git a/drivers/char/ip2main.c b/drivers/char/ip2main.c index cf0cd58d6305..066d7b5cb76d 100644 --- a/drivers/char/ip2main.c +++ b/drivers/char/ip2main.c | |||
| @@ -120,7 +120,6 @@ | |||
| 120 | 120 | ||
| 121 | #include <linux/vmalloc.h> | 121 | #include <linux/vmalloc.h> |
| 122 | #include <linux/init.h> | 122 | #include <linux/init.h> |
| 123 | #include <asm/serial.h> | ||
| 124 | 123 | ||
| 125 | #include <asm/uaccess.h> | 124 | #include <asm/uaccess.h> |
| 126 | 125 | ||
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c index ec949e4c070f..8982eafd0fb7 100644 --- a/drivers/char/synclinkmp.c +++ b/drivers/char/synclinkmp.c | |||
| @@ -55,7 +55,6 @@ | |||
| 55 | #include <linux/netdevice.h> | 55 | #include <linux/netdevice.h> |
| 56 | #include <linux/vmalloc.h> | 56 | #include <linux/vmalloc.h> |
| 57 | #include <linux/init.h> | 57 | #include <linux/init.h> |
| 58 | #include <asm/serial.h> | ||
| 59 | #include <linux/delay.h> | 58 | #include <linux/delay.h> |
| 60 | #include <linux/ioctl.h> | 59 | #include <linux/ioctl.h> |
| 61 | 60 | ||