diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/char/ip2main.c | 1 | ||||
| -rw-r--r-- | drivers/char/synclinkmp.c | 1 | ||||
| -rw-r--r-- | drivers/pci/pci.c | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 2bc9d64db10..c29365d5b52 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -80,7 +80,7 @@ config SERIAL_NONSTANDARD 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 SYNCLINK 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 --git a/drivers/char/ip2main.c b/drivers/char/ip2main.c index cf0cd58d630..066d7b5cb76 100644 --- a/drivers/char/ip2main.c +++ b/drivers/char/ip2main.c @@ -120,7 +120,6 @@ #include <linux/vmalloc.h> #include <linux/init.h> -#include <asm/serial.h> #include <asm/uaccess.h> diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c index ec949e4c070..8982eafd0fb 100644 --- a/drivers/char/synclinkmp.c +++ b/drivers/char/synclinkmp.c @@ -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> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index ccff633a394..992db89adce 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -819,7 +819,7 @@ pci_intx(struct pci_dev *pdev, int enable) } if (new != pci_command) { - pci_write_config_word(pdev, PCI_COMMAND, pci_command); + pci_write_config_word(pdev, PCI_COMMAND, new); } } |