2005-09-09 16:02:53

by Al Viro

Subject: [PATCH] gratitious includes of asm/serial.h

Removed gratitious 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 <[email protected]>
----
diff -urN RC13-git7-ppc44x-pm/drivers/char/Kconfig RC13-git7-serial/drivers/char/Kconfig
--- RC13-git7-ppc44x-pm/drivers/char/Kconfig 2005-09-07 13:55:10.000000000 -0400
+++ RC13-git7-serial/drivers/char/Kconfig 2005-09-07 13:55:31.000000000 -0400
@@ -80,7 +80,7 @@

config COMPUTONE
tristate "Computone IntelliPort Plus serial support"
- depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (BROKEN || !SPARC32)
+ depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
---help---
This driver supports the entire family of Intelliport II/Plus
controllers with the exception of the MicroChannel controllers and
@@ -208,7 +208,7 @@

config SYNCLINKMP
tristate "SyncLink Multiport support"
- depends on SERIAL_NONSTANDARD && (BROKEN || !SPARC32)
+ depends on SERIAL_NONSTANDARD
help
Enable support for the SyncLink Multiport (2 or 4 ports)
serial adapter, running asynchronous and HDLC communications up
diff -urN RC13-git7-ppc44x-pm/drivers/char/ip2main.c RC13-git7-serial/drivers/char/ip2main.c
--- RC13-git7-ppc44x-pm/drivers/char/ip2main.c 2005-08-28 23:09:41.000000000 -0400
+++ RC13-git7-serial/drivers/char/ip2main.c 2005-09-07 13:55:31.000000000 -0400
@@ -120,7 +120,6 @@

#include <linux/vmalloc.h>
#include <linux/init.h>
-#include <asm/serial.h>

#include <asm/uaccess.h>

diff -urN RC13-git7-ppc44x-pm/drivers/char/synclinkmp.c RC13-git7-serial/drivers/char/synclinkmp.c
--- RC13-git7-ppc44x-pm/drivers/char/synclinkmp.c 2005-06-17 15:48:29.000000000 -0400
+++ RC13-git7-serial/drivers/char/synclinkmp.c 2005-09-07 13:55:31.000000000 -0400
@@ -55,7 +55,6 @@
#include <linux/netdevice.h>
#include <linux/vmalloc.h>
#include <linux/init.h>
-#include <asm/serial.h>
#include <linux/delay.h>
#include <linux/ioctl.h>

2005-09-09 16:33:58

by Russell King

Subject: Re: [PATCH] gratitious includes of asm/serial.h

On Fri, Sep 09, 2005 at 05:02:51PM +0100, [email protected] wrote:
> Removed gratitious 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 <[email protected]>

Acked-by: Russell King <[email protected]>

This stuff does need fixing. One day, I hope to completely remove the
asm-*/serial.h includes from the kernel.

Thanks Al.

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 Serial core