Commit f91f4d923f4039bf3460eca299ed5a3f7ecd7b96

Authored by viro@ZenIV.linux.org.uk
Committed by Linus Torvalds
1 parent d310a35a48

[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>

Showing 3 changed files with 2 additions and 4 deletions Side-by-side Diff

drivers/char/Kconfig
... ... @@ -80,7 +80,7 @@
80 80  
81 81 config COMPUTONE
82 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 84 ---help---
85 85 This driver supports the entire family of Intelliport II/Plus
86 86 controllers with the exception of the MicroChannel controllers and
... ... @@ -208,7 +208,7 @@
208 208  
209 209 config SYNCLINKMP
210 210 tristate "SyncLink Multiport support"
211   - depends on SERIAL_NONSTANDARD && (BROKEN || !SPARC32)
  211 + depends on SERIAL_NONSTANDARD
212 212 help
213 213 Enable support for the SyncLink Multiport (2 or 4 ports)
214 214 serial adapter, running asynchronous and HDLC communications up
drivers/char/ip2main.c
... ... @@ -120,7 +120,6 @@
120 120  
121 121 #include <linux/vmalloc.h>
122 122 #include <linux/init.h>
123   -#include <asm/serial.h>
124 123  
125 124 #include <asm/uaccess.h>
126 125  
drivers/char/synclinkmp.c
... ... @@ -55,7 +55,6 @@
55 55 #include <linux/netdevice.h>
56 56 #include <linux/vmalloc.h>
57 57 #include <linux/init.h>
58   -#include <asm/serial.h>
59 58 #include <linux/delay.h>
60 59 #include <linux/ioctl.h>
61 60