Message ID | 1274680263.24569.3474.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 026de82..fa1b0f1 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -144,7 +144,6 @@ CONFIG_TCG_TPM=m CONFIG_TCP_CONG_ADVANCED=y CONFIG_TIPC=m CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET=m CONFIG_USB_ISP1362_HCD=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index b45489b..9e461ce 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -129,7 +129,6 @@ CONFIG_STANDALONE=y # CONFIG_TCP_CONG_ADVANCED is not set # CONFIG_TIPC is not set # CONFIG_UNIXWARE_DISKLABEL is not set -CONFIG_USB=m CONFIG_USB_EHCI_HCD=m # CONFIG_USB_GADGET is not set # CONFIG_USB_ISP1362_HCD is not set diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports index 924c4ed..90f7f3e 100644 --- a/debian.master/config/config.common.ports +++ b/debian.master/config/config.common.ports @@ -3618,6 +3618,7 @@ CONFIG_UNIX=y CONFIG_UNIX98_PTYS=y CONFIG_UNUSED_SYMBOLS=y CONFIG_US3_MC=m +CONFIG_USB=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 75f672b..f7ceeed 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -4143,6 +4143,7 @@ CONFIG_ULTRIX_PARTITION=y CONFIG_UNIX=y CONFIG_UNIX98_PTYS=y CONFIG_UNUSED_SYMBOLS=y +CONFIG_USB=y CONFIG_USBPCWATCHDOG=m CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index d24f949..1f0f00a 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -144,7 +144,6 @@ CONFIG_TCG_TPM=m CONFIG_TCP_CONG_ADVANCED=y CONFIG_TIPC=m CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET=m CONFIG_USB_ISP1362_HCD=m diff --git a/debian.master/config/ia64/config.common.ia64 b/debian.master/config/ia64/config.common.ia64 index 92f8e93..56406bd 100644 --- a/debian.master/config/ia64/config.common.ia64 +++ b/debian.master/config/ia64/config.common.ia64 @@ -242,7 +242,6 @@ CONFIG_UBIFS_FS=m # CONFIG_UFS_FS is not set CONFIG_ULTRIX_PARTITION=y CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET=m CONFIG_USB_GADGET_DUALSPEED=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 668167e..277dda9 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -212,7 +212,6 @@ CONFIG_TR=y CONFIG_UFS_FS=m CONFIG_ULTRIX_PARTITION=y CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET=m CONFIG_USB_HIDDEV=y diff --git a/debian.master/config/sparc/config.common.sparc b/debian.master/config/sparc/config.common.sparc index 1686b39..d40de47 100644 --- a/debian.master/config/sparc/config.common.sparc +++ b/debian.master/config/sparc/config.common.sparc @@ -250,7 +250,6 @@ CONFIG_UBIFS_FS=m CONFIG_UFS_FS=m # CONFIG_ULTRIX_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set -CONFIG_USB=m CONFIG_USB_EHCI_HCD=m CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DUALSPEED=y