topconfig unset PRISM54
nuke any duplicate definition, P54 is wanted these days. svn path=/dists/trunk/linux-2.6/; revision=11374
This commit is contained in:
parent
fc85415c38
commit
a10d2faa9b
|
@ -983,7 +983,6 @@ CONFIG_PCI_ATMEL=m
|
|||
CONFIG_PCMCIA_ATMEL=m
|
||||
CONFIG_AIRO_CS=m
|
||||
CONFIG_PCMCIA_WL3501=m
|
||||
CONFIG_PRISM54=m
|
||||
CONFIG_USB_ZD1201=m
|
||||
|
||||
##
|
||||
|
|
|
@ -1067,7 +1067,6 @@ CONFIG_PCI_ATMEL=m
|
|||
CONFIG_PCMCIA_ATMEL=m
|
||||
CONFIG_AIRO_CS=m
|
||||
CONFIG_PCMCIA_WL3501=m
|
||||
CONFIG_PRISM54=m
|
||||
CONFIG_USB_ZD1201=m
|
||||
|
||||
##
|
||||
|
|
|
@ -807,7 +807,6 @@ CONFIG_PCI_ATMEL=m
|
|||
CONFIG_PCMCIA_ATMEL=m
|
||||
CONFIG_AIRO_CS=m
|
||||
CONFIG_PCMCIA_WL3501=m
|
||||
CONFIG_PRISM54=m
|
||||
# CONFIG_USB_ZD1201 is not set
|
||||
|
||||
##
|
||||
|
|
|
@ -559,7 +559,6 @@ CONFIG_NORTEL_HERMES=m
|
|||
CONFIG_PCI_HERMES=m
|
||||
CONFIG_ATMEL=m
|
||||
# CONFIG_PCI_ATMEL is not set
|
||||
# CONFIG_PRISM54 is not set
|
||||
|
||||
##
|
||||
## file: drivers/net/wireless/hostap/Kconfig
|
||||
|
|
|
@ -770,7 +770,6 @@ CONFIG_NORTEL_HERMES=m
|
|||
CONFIG_PCI_HERMES=m
|
||||
CONFIG_ATMEL=m
|
||||
# CONFIG_PCI_ATMEL is not set
|
||||
# CONFIG_PRISM54 is not set
|
||||
# CONFIG_USB_ZD1201 is not set
|
||||
CONFIG_RTL8187=m
|
||||
# CONFIG_ADM8211 is not set
|
||||
|
|
|
@ -1148,6 +1148,7 @@ CONFIG_LIBERTAS_SDIO=m
|
|||
CONFIG_AIRO=m
|
||||
CONFIG_NORTEL_HERMES=m
|
||||
CONFIG_PCMCIA_SPECTRUM=m
|
||||
# CONFIG_PRISM54 is not set
|
||||
CONFIG_USB_NET_RNDIS_WLAN=m
|
||||
CONFIG_RTL8180=m
|
||||
CONFIG_RTL8187=m
|
||||
|
|
|
@ -406,7 +406,6 @@ CONFIG_PCMCIA_HERMES=m
|
|||
# CONFIG_ATMEL is not set
|
||||
CONFIG_AIRO_CS=m
|
||||
CONFIG_PCMCIA_WL3501=m
|
||||
CONFIG_PRISM54=m
|
||||
# CONFIG_USB_ZD1201 is not set
|
||||
|
||||
##
|
||||
|
|
|
@ -1277,7 +1277,6 @@ CONFIG_PCI_ATMEL=m
|
|||
CONFIG_PCMCIA_ATMEL=m
|
||||
CONFIG_AIRO_CS=m
|
||||
CONFIG_PCMCIA_WL3501=m
|
||||
CONFIG_PRISM54=m
|
||||
CONFIG_USB_ZD1201=m
|
||||
|
||||
##
|
||||
|
|
|
@ -649,7 +649,6 @@ CONFIG_PCI_ATMEL=m
|
|||
CONFIG_PCMCIA_ATMEL=m
|
||||
CONFIG_AIRO_CS=m
|
||||
CONFIG_PCMCIA_WL3501=m
|
||||
CONFIG_PRISM54=m
|
||||
CONFIG_USB_ZD1201=m
|
||||
|
||||
##
|
||||
|
|
|
@ -1255,7 +1255,6 @@ CONFIG_NORTEL_HERMES=m
|
|||
CONFIG_PCI_HERMES=m
|
||||
CONFIG_ATMEL=m
|
||||
CONFIG_PCI_ATMEL=m
|
||||
CONFIG_PRISM54=m
|
||||
CONFIG_USB_ZD1201=m
|
||||
|
||||
##
|
||||
|
|
|
@ -1499,7 +1499,6 @@ CONFIG_NORTEL_HERMES=m
|
|||
CONFIG_PCI_HERMES=m
|
||||
CONFIG_ATMEL=m
|
||||
CONFIG_PCI_ATMEL=m
|
||||
CONFIG_PRISM54=m
|
||||
CONFIG_USB_ZD1201=m
|
||||
|
||||
##
|
||||
|
|
|
@ -1254,7 +1254,6 @@ CONFIG_NORTEL_HERMES=m
|
|||
CONFIG_PCI_HERMES=m
|
||||
CONFIG_ATMEL=m
|
||||
CONFIG_PCI_ATMEL=m
|
||||
CONFIG_PRISM54=m
|
||||
CONFIG_USB_ZD1201=m
|
||||
|
||||
##
|
||||
|
|
|
@ -1498,7 +1498,6 @@ CONFIG_NORTEL_HERMES=m
|
|||
CONFIG_PCI_HERMES=m
|
||||
CONFIG_ATMEL=m
|
||||
CONFIG_PCI_ATMEL=m
|
||||
CONFIG_PRISM54=m
|
||||
CONFIG_USB_ZD1201=m
|
||||
|
||||
##
|
||||
|
|
|
@ -644,7 +644,6 @@ CONFIG_NORTEL_HERMES=m
|
|||
CONFIG_PCI_HERMES=m
|
||||
CONFIG_ATMEL=m
|
||||
CONFIG_PCI_ATMEL=m
|
||||
# CONFIG_PRISM54 is not set
|
||||
CONFIG_USB_ZD1201=m
|
||||
|
||||
##
|
||||
|
|
|
@ -735,7 +735,6 @@ CONFIG_ATMEL=m
|
|||
CONFIG_PCMCIA_ATMEL=m
|
||||
CONFIG_AIRO_CS=m
|
||||
CONFIG_PCMCIA_WL3501=m
|
||||
CONFIG_PRISM54=m
|
||||
CONFIG_USB_ZD1201=m
|
||||
|
||||
##
|
||||
|
|
Loading…
Reference in New Issue