/[linux-patches]/genpatches-2.6/trunk/2.6.13/1360_sparc-kconfig-depends.patch
Gentoo

Diff of /genpatches-2.6/trunk/2.6.13/1360_sparc-kconfig-depends.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 151 Revision 152
1diff -Naurp linux-2.6.13-rc3-git4/drivers/char/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/char/Kconfig 1diff -urNpX dontdiff linux-2.6.13-rc7/drivers/char/Kconfig linux-dsd/drivers/char/Kconfig
2--- linux-2.6.13-rc3-git4/drivers/char/Kconfig 2005-07-24 14:07:00.675871584 -0700 2--- linux-2.6.13-rc7/drivers/char/Kconfig 2005-08-24 09:53:25.000000000 +0100
3+++ linux-2.6.13-rc3-git4-gentoo/drivers/char/Kconfig 2005-07-24 14:05:19.753572397 -0700 3+++ linux-dsd/drivers/char/Kconfig 2005-08-29 13:55:18.000000000 +0100
4@@ -80,7 +80,7 @@ config SERIAL_NONSTANDARD 4@@ -80,7 +80,7 @@ config SERIAL_NONSTANDARD
5 5
6 config COMPUTONE 6 config COMPUTONE
7 tristate "Computone IntelliPort Plus serial support" 7 tristate "Computone IntelliPort Plus serial support"
8- depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
9+ depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (PCI || ISA) 8- depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (BROKEN || !SPARC32)
9+ depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (PCI || ISA) && (BROKEN || !SPARC32)
10 ---help--- 10 ---help---
11 This driver supports the entire family of Intelliport II/Plus 11 This driver supports the entire family of Intelliport II/Plus
12 controllers with the exception of the MicroChannel controllers and 12 controllers with the exception of the MicroChannel controllers and
13@@ -95,7 +95,7 @@ config COMPUTONE 13@@ -95,7 +95,7 @@ config COMPUTONE
14 14
30 You would need something like this to connect more than two modems to 30 You would need something like this to connect more than two modems to
31@@ -138,7 +138,7 @@ config CYZ_INTR 31@@ -138,7 +138,7 @@ config CYZ_INTR
32 32
33 config DIGIEPCA 33 config DIGIEPCA
34 tristate "Digiboard Intelligent Async Support" 34 tristate "Digiboard Intelligent Async Support"
35- depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
36+ depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (PCI || ISA) 35- depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (!64BIT || BROKEN)
36+ depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && (PCI || ISA) && (!64BIT || BROKEN)
37 ---help--- 37 ---help---
38 This is a driver for Digi International's Xx, Xeve, and Xem series 38 This is a driver for Digi International's Xx, Xeve, and Xem series
39 of cards which provide multiple serial ports. You would need 39 of cards which provide multiple serial ports. You would need
40@@ -166,7 +166,7 @@ config ESPSERIAL 40@@ -166,7 +166,7 @@ config ESPSERIAL
41 41
57 57
58@@ -208,7 +208,7 @@ config SYNCLINK 58@@ -208,7 +208,7 @@ config SYNCLINK
59 59
60 config SYNCLINKMP 60 config SYNCLINKMP
61 tristate "SyncLink Multiport support" 61 tristate "SyncLink Multiport support"
62- depends on SERIAL_NONSTANDARD
63+ depends on SERIAL_NONSTANDARD && (PCI || ISA) 62- depends on SERIAL_NONSTANDARD && (BROKEN || !SPARC32)
63+ depends on SERIAL_NONSTANDARD && (PCI || ISA) && (BROKEN || !SPARC32)
64 help 64 help
65 Enable support for the SyncLink Multiport (2 or 4 ports) 65 Enable support for the SyncLink Multiport (2 or 4 ports)
66 serial adapter, running asynchronous and HDLC communications up 66 serial adapter, running asynchronous and HDLC communications up
67@@ -234,7 +234,7 @@ config N_HDLC 67@@ -234,7 +234,7 @@ config N_HDLC
68 68

Legend:
Removed from v.151  
changed lines
  Added in v.152

  ViewVC Help
Powered by ViewVC 1.1.20