Message ID | 1276099718.1221.54.camel@emiko |
---|---|
State | Accepted |
Delegated to: | Leann Ogasawara |
Headers | show |
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index e606692..aaf1ee6 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -20,7 +20,6 @@ CONFIG_AUDIT_ARCH=y CONFIG_B43=m CONFIG_B43LEGACY=m CONFIG_B44=m -CONFIG_BNX2=m CONFIG_BT=m # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_CDROM_PKTCDVD=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index eb97ea5..c803e58 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -7,7 +7,6 @@ CONFIG_ASYNC_TX_DMA=y CONFIG_ATM_BR2684_IPFILTER=y CONFIG_ATM_DUMMY=m -# CONFIG_BNX2 is not set # CONFIG_CNIC is not set # CONFIG_COMEDI is not set CONFIG_DEFAULT_CFQ=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 1559932..e77a720 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -447,6 +447,7 @@ CONFIG_BLK_DEV_UMEM=m # CONFIG_BLK_DEV_XIP is not set CONFIG_BLOCK=y CONFIG_BLOCK_COMPAT=y +CONFIG_BNX2=m CONFIG_BNX2X=m CONFIG_BONDING=m # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index e99ff35..69153b3 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -18,7 +18,6 @@ CONFIG_ATM=m CONFIG_B43=m CONFIG_B43LEGACY=m CONFIG_B44=m -CONFIG_BNX2=m CONFIG_BT=m # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_CDROM_PKTCDVD=y