de4x5: Disable on all architectures except alpha (Closes: #639538)
svn path=/dists/trunk/linux-2.6/; revision=18026
This commit is contained in:
parent
0b32563e35
commit
380567132d
|
@ -23,6 +23,7 @@ linux-2.6 (3.1.0~rc3-1~experimental.1) UNRELEASED; urgency=low
|
|||
* media/dvb: Enable DVB_NET
|
||||
* media/rc: Enable IR_MCE_KBD_DECODER as module
|
||||
* gspca: Enable USB_GSPCA_SE401 as module
|
||||
* de4x5: Disable on all architectures except alpha (Closes: #639538)
|
||||
|
||||
-- Ben Hutchings <ben@decadent.org.uk> Wed, 27 Jul 2011 23:58:10 +0200
|
||||
|
||||
|
|
|
@ -1881,6 +1881,7 @@ CONFIG_SMCTR=m
|
|||
CONFIG_DE2104X_DSL=0
|
||||
CONFIG_TULIP_NAPI=y
|
||||
CONFIG_TULIP_NAPI_HW_MITIGATION=y
|
||||
# CONFIG_DE4X5 is not set
|
||||
CONFIG_ULI526X=m
|
||||
|
||||
##
|
||||
|
|
|
@ -326,7 +326,6 @@ CONFIG_NET_TULIP=y
|
|||
CONFIG_TULIP=m
|
||||
# CONFIG_TULIP_MWI is not set
|
||||
CONFIG_TULIP_MMIO=y
|
||||
# CONFIG_DE4X5 is not set
|
||||
# CONFIG_WINBOND_840 is not set
|
||||
# CONFIG_DM9102 is not set
|
||||
CONFIG_PCMCIA_XIRCOM=m
|
||||
|
|
|
@ -455,7 +455,6 @@ CONFIG_DE2104X=m
|
|||
CONFIG_TULIP=m
|
||||
# CONFIG_TULIP_MWI is not set
|
||||
# CONFIG_TULIP_MMIO is not set
|
||||
CONFIG_DE4X5=y
|
||||
CONFIG_WINBOND_840=m
|
||||
CONFIG_DM9102=m
|
||||
CONFIG_PCMCIA_XIRCOM=m
|
||||
|
|
|
@ -890,7 +890,6 @@ CONFIG_DE2104X=m
|
|||
CONFIG_TULIP=m
|
||||
# CONFIG_TULIP_MWI is not set
|
||||
# CONFIG_TULIP_MMIO is not set
|
||||
CONFIG_DE4X5=m
|
||||
CONFIG_WINBOND_840=m
|
||||
CONFIG_DM9102=m
|
||||
CONFIG_PCMCIA_XIRCOM=m
|
||||
|
|
|
@ -675,7 +675,6 @@ CONFIG_TULIP=m
|
|||
# CONFIG_TULIP_MWI is not set
|
||||
# CONFIG_TULIP_MMIO is not set
|
||||
# CONFIG_TULIP_NAPI is not set
|
||||
CONFIG_DE4X5=m
|
||||
# CONFIG_WINBOND_840 is not set
|
||||
CONFIG_DM9102=m
|
||||
# CONFIG_ULI526X is not set
|
||||
|
|
|
@ -679,7 +679,6 @@ CONFIG_TULIP=m
|
|||
# CONFIG_TULIP_MWI is not set
|
||||
# CONFIG_TULIP_MMIO is not set
|
||||
# CONFIG_TULIP_NAPI is not set
|
||||
CONFIG_DE4X5=m
|
||||
# CONFIG_WINBOND_840 is not set
|
||||
CONFIG_DM9102=m
|
||||
# CONFIG_ULI526X is not set
|
||||
|
|
|
@ -384,7 +384,6 @@ CONFIG_E100=m
|
|||
CONFIG_NET_TULIP=y
|
||||
CONFIG_DE2104X=m
|
||||
CONFIG_TULIP=m
|
||||
CONFIG_DE4X5=m
|
||||
CONFIG_WINBOND_840=m
|
||||
CONFIG_DM9102=m
|
||||
CONFIG_ULI526X=m
|
||||
|
|
|
@ -486,7 +486,6 @@ CONFIG_TULIP=y
|
|||
CONFIG_TULIP_MWI=y
|
||||
CONFIG_TULIP_MMIO=y
|
||||
# CONFIG_TULIP_NAPI is not set
|
||||
# CONFIG_DE4X5 is not set
|
||||
# CONFIG_WINBOND_840 is not set
|
||||
# CONFIG_DM9102 is not set
|
||||
# CONFIG_ULI526X is not set
|
||||
|
|
|
@ -559,7 +559,6 @@ CONFIG_DE2104X=m
|
|||
CONFIG_TULIP=m
|
||||
# CONFIG_TULIP_MWI is not set
|
||||
# CONFIG_TULIP_MMIO is not set
|
||||
CONFIG_DE4X5=m
|
||||
CONFIG_WINBOND_840=m
|
||||
CONFIG_DM9102=m
|
||||
CONFIG_PCMCIA_XIRCOM=m
|
||||
|
|
|
@ -329,7 +329,6 @@ CONFIG_NET_TULIP=y
|
|||
CONFIG_TULIP=m
|
||||
# CONFIG_TULIP_MWI is not set
|
||||
# CONFIG_TULIP_MMIO is not set
|
||||
# CONFIG_DE4X5 is not set
|
||||
CONFIG_WINBOND_840=m
|
||||
CONFIG_DM9102=m
|
||||
|
||||
|
|
Loading…
Reference in New Issue