diff mbox

[3/3] UBUNTU: [Config] armhf: generic: MFD_TI_AM335X_TSCADC and USB_DWC3_OMAP = m

Message ID 1395676119-22306-4-git-send-email-paolo.pisati@canonical.com
State New
Headers show

Commit Message

Paolo Pisati March 24, 2014, 3:48 p.m. UTC 
BugLink: http://bugs.launchpad.net/bugs/1294962

Reduce the scope of MFD_TI_AM335X_TSCADC (and the depending modules
MFD_TI_AM335X_TSCADC and TOUCHSCREEN_TI_AM335X_TSC) and USB_DWC3_OMAP to
the generic armhf kernel only.

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 debian.master/abi/3.13.0-19.40/amd64/generic.modules          | 4 ----
 debian.master/abi/3.13.0-19.40/amd64/lowlatency.modules       | 4 ----
 debian.master/abi/3.13.0-19.40/arm64/generic.modules          | 3 ---
 debian.master/abi/3.13.0-19.40/armhf/generic-lpae.modules     | 4 ----
 debian.master/abi/3.13.0-19.40/i386/generic.modules           | 4 ----
 debian.master/abi/3.13.0-19.40/i386/lowlatency.modules        | 4 ----
 debian.master/abi/3.13.0-19.40/powerpc/powerpc-e500.modules   | 4 ----
 debian.master/abi/3.13.0-19.40/powerpc/powerpc-e500mc.modules | 4 ----
 debian.master/abi/3.13.0-19.40/powerpc/powerpc-smp.modules    | 4 ----
 debian.master/abi/3.13.0-19.40/powerpc/powerpc64-emb.modules  | 4 ----
 debian.master/abi/3.13.0-19.40/powerpc/powerpc64-smp.modules  | 4 ----
 debian.master/abi/3.13.0-19.40/ppc64el/generic.modules        | 3 ---
 debian.master/config/amd64/config.common.amd64                | 2 ++
 debian.master/config/arm64/config.common.arm64                | 1 +
 debian.master/config/armhf/config.flavour.generic             | 2 ++
 debian.master/config/armhf/config.flavour.generic-lpae        | 2 ++
 debian.master/config/config.common.ubuntu                     | 2 --
 debian.master/config/i386/config.common.i386                  | 2 ++
 debian.master/config/powerpc/config.common.powerpc            | 2 ++
 debian.master/config/ppc64el/config.common.ppc64el            | 1 +
 20 files changed, 12 insertions(+), 48 deletions(-)
diff mbox

Patch

diff --git a/debian.master/abi/3.13.0-19.40/amd64/generic.modules b/debian.master/abi/3.13.0-19.40/amd64/generic.modules
index 4780fbf..50adfc5 100644
--- a/debian.master/abi/3.13.0-19.40/amd64/generic.modules
+++ b/debian.master/abi/3.13.0-19.40/amd64/generic.modules
@@ -875,7 +875,6 @@  dwc2
 dwc2_pci
 dwc2_platform
 dwc3
-dwc3-omap
 dwc3-pci
 dw_dmac
 dw_dmac_core
@@ -3451,9 +3450,6 @@  tgr192
 thinkpad_acpi
 thmc50
 ti-adc081c
-ti_am335x_adc
-ti_am335x_tsc
-ti_am335x_tscadc
 ti_dac7512
 tifm_7xx1
 tifm_core
diff --git a/debian.master/abi/3.13.0-19.40/amd64/lowlatency.modules b/debian.master/abi/3.13.0-19.40/amd64/lowlatency.modules
index ef8e67f..0571a3f 100644
--- a/debian.master/abi/3.13.0-19.40/amd64/lowlatency.modules
+++ b/debian.master/abi/3.13.0-19.40/amd64/lowlatency.modules
@@ -875,7 +875,6 @@  dwc2
 dwc2_pci
 dwc2_platform
 dwc3
-dwc3-omap
 dwc3-pci
 dw_dmac
 dw_dmac_core
@@ -3450,9 +3449,6 @@  tgr192
 thinkpad_acpi
 thmc50
 ti-adc081c
-ti_am335x_adc
-ti_am335x_tsc
-ti_am335x_tscadc
 ti_dac7512
 tifm_7xx1
 tifm_core
diff --git a/debian.master/abi/3.13.0-19.40/arm64/generic.modules b/debian.master/abi/3.13.0-19.40/arm64/generic.modules
index 2b1fe62..bed6eba 100644
--- a/debian.master/abi/3.13.0-19.40/arm64/generic.modules
+++ b/debian.master/abi/3.13.0-19.40/arm64/generic.modules
@@ -2362,9 +2362,6 @@  tg3
 tgr192
 thmc50
 ti-adc081c
-ti_am335x_adc
-ti_am335x_tsc
-ti_am335x_tscadc
 ti_dac7512
 tifm_7xx1
 tifm_core
diff --git a/debian.master/abi/3.13.0-19.40/armhf/generic-lpae.modules b/debian.master/abi/3.13.0-19.40/armhf/generic-lpae.modules
index 56099c4..4976a56 100644
--- a/debian.master/abi/3.13.0-19.40/armhf/generic-lpae.modules
+++ b/debian.master/abi/3.13.0-19.40/armhf/generic-lpae.modules
@@ -622,7 +622,6 @@  dvb-usb-vp7045
 dwc2
 dwc2_platform
 dwc3
-dwc3-omap
 dw_dmac
 dw_dmac_core
 dw_mmc
@@ -2404,9 +2403,6 @@  test-string_helpers
 tgr192
 thmc50
 ti-adc081c
-ti_am335x_adc
-ti_am335x_tsc
-ti_am335x_tscadc
 ti_dac7512
 timb_dma
 timblogiw
diff --git a/debian.master/abi/3.13.0-19.40/i386/generic.modules b/debian.master/abi/3.13.0-19.40/i386/generic.modules
index 6b32e52..960d2ce 100644
--- a/debian.master/abi/3.13.0-19.40/i386/generic.modules
+++ b/debian.master/abi/3.13.0-19.40/i386/generic.modules
@@ -897,7 +897,6 @@  dwc2
 dwc2_pci
 dwc2_platform
 dwc3
-dwc3-omap
 dwc3-pci
 dw_dmac
 dw_dmac_core
@@ -3598,9 +3597,6 @@  tgr192
 thinkpad_acpi
 thmc50
 ti-adc081c
-ti_am335x_adc
-ti_am335x_tsc
-ti_am335x_tscadc
 ti_dac7512
 tifm_7xx1
 tifm_core
diff --git a/debian.master/abi/3.13.0-19.40/i386/lowlatency.modules b/debian.master/abi/3.13.0-19.40/i386/lowlatency.modules
index daec62a..0bb72db 100644
--- a/debian.master/abi/3.13.0-19.40/i386/lowlatency.modules
+++ b/debian.master/abi/3.13.0-19.40/i386/lowlatency.modules
@@ -897,7 +897,6 @@  dwc2
 dwc2_pci
 dwc2_platform
 dwc3
-dwc3-omap
 dwc3-pci
 dw_dmac
 dw_dmac_core
@@ -3597,9 +3596,6 @@  tgr192
 thinkpad_acpi
 thmc50
 ti-adc081c
-ti_am335x_adc
-ti_am335x_tsc
-ti_am335x_tscadc
 ti_dac7512
 tifm_7xx1
 tifm_core
diff --git a/debian.master/abi/3.13.0-19.40/powerpc/powerpc-e500.modules b/debian.master/abi/3.13.0-19.40/powerpc/powerpc-e500.modules
index 6571429..31c8c03e 100644
--- a/debian.master/abi/3.13.0-19.40/powerpc/powerpc-e500.modules
+++ b/debian.master/abi/3.13.0-19.40/powerpc/powerpc-e500.modules
@@ -807,7 +807,6 @@  dwc2
 dwc2_pci
 dwc2_platform
 dwc3
-dwc3-omap
 dwc3-pci
 dw_dmac
 dw_dmac_core
@@ -3233,9 +3232,6 @@  tg3
 tgr192
 thmc50
 ti-adc081c
-ti_am335x_adc
-ti_am335x_tsc
-ti_am335x_tscadc
 ti_dac7512
 tifm_7xx1
 tifm_core
diff --git a/debian.master/abi/3.13.0-19.40/powerpc/powerpc-e500mc.modules b/debian.master/abi/3.13.0-19.40/powerpc/powerpc-e500mc.modules
index 693c276..c4b153e 100644
--- a/debian.master/abi/3.13.0-19.40/powerpc/powerpc-e500mc.modules
+++ b/debian.master/abi/3.13.0-19.40/powerpc/powerpc-e500mc.modules
@@ -807,7 +807,6 @@  dwc2
 dwc2_pci
 dwc2_platform
 dwc3
-dwc3-omap
 dwc3-pci
 dw_dmac
 dw_dmac_core
@@ -3220,9 +3219,6 @@  tg3
 tgr192
 thmc50
 ti-adc081c
-ti_am335x_adc
-ti_am335x_tsc
-ti_am335x_tscadc
 ti_dac7512
 tifm_7xx1
 tifm_core
diff --git a/debian.master/abi/3.13.0-19.40/powerpc/powerpc-smp.modules b/debian.master/abi/3.13.0-19.40/powerpc/powerpc-smp.modules
index 80933c6..a65d875 100644
--- a/debian.master/abi/3.13.0-19.40/powerpc/powerpc-smp.modules
+++ b/debian.master/abi/3.13.0-19.40/powerpc/powerpc-smp.modules
@@ -796,7 +796,6 @@  dwc2
 dwc2_pci
 dwc2_platform
 dwc3
-dwc3-omap
 dwc3-pci
 dw_dmac
 dw_dmac_core
@@ -3206,9 +3205,6 @@  tgr192
 therm_windtunnel
 thmc50
 ti-adc081c
-ti_am335x_adc
-ti_am335x_tsc
-ti_am335x_tscadc
 ti_dac7512
 tifm_7xx1
 tifm_core
diff --git a/debian.master/abi/3.13.0-19.40/powerpc/powerpc64-emb.modules b/debian.master/abi/3.13.0-19.40/powerpc/powerpc64-emb.modules
index 20708d5..baf7749 100644
--- a/debian.master/abi/3.13.0-19.40/powerpc/powerpc64-emb.modules
+++ b/debian.master/abi/3.13.0-19.40/powerpc/powerpc64-emb.modules
@@ -792,7 +792,6 @@  dwc2
 dwc2_pci
 dwc2_platform
 dwc3
-dwc3-omap
 dwc3-pci
 dw_dmac
 dw_dmac_core
@@ -3195,9 +3194,6 @@  tg3
 tgr192
 thmc50
 ti-adc081c
-ti_am335x_adc
-ti_am335x_tsc
-ti_am335x_tscadc
 ti_dac7512
 tifm_7xx1
 tifm_core
diff --git a/debian.master/abi/3.13.0-19.40/powerpc/powerpc64-smp.modules b/debian.master/abi/3.13.0-19.40/powerpc/powerpc64-smp.modules
index a95e9c9..f264644 100644
--- a/debian.master/abi/3.13.0-19.40/powerpc/powerpc64-smp.modules
+++ b/debian.master/abi/3.13.0-19.40/powerpc/powerpc64-smp.modules
@@ -782,7 +782,6 @@  dwc2
 dwc2_pci
 dwc2_platform
 dwc3
-dwc3-omap
 dwc3-pci
 dw_dmac
 dw_dmac_core
@@ -3202,9 +3201,6 @@  tgr192
 therm_pm72
 thmc50
 ti-adc081c
-ti_am335x_adc
-ti_am335x_tsc
-ti_am335x_tscadc
 ti_dac7512
 tifm_7xx1
 tifm_core
diff --git a/debian.master/abi/3.13.0-19.40/ppc64el/generic.modules b/debian.master/abi/3.13.0-19.40/ppc64el/generic.modules
index 3c5e86c..bad6aa2 100644
--- a/debian.master/abi/3.13.0-19.40/ppc64el/generic.modules
+++ b/debian.master/abi/3.13.0-19.40/ppc64el/generic.modules
@@ -1817,9 +1817,6 @@  test_power
 tgr192
 thmc50
 ti-adc081c
-ti_am335x_adc
-ti_am335x_tsc
-ti_am335x_tscadc
 ti_dac7512
 tifm_7xx1
 tifm_core
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 6f18aee..615c427 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -155,6 +155,7 @@  CONFIG_MEMORY=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_MEMSTICK=m
 # CONFIG_MFD_SM501_GPIO is not set
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_TMIO is not set
 CONFIG_MII=m
 # CONFIG_MLX4_DEBUG is not set
@@ -336,6 +337,7 @@  CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CYPRESS_CY7C63=m
 CONFIG_USB_CYTHERM=m
 CONFIG_USB_DWC3=m
+# CONFIG_USB_DWC3_OMAP is not set
 CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 2bf2e5a..c4d05df 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -134,6 +134,7 @@  CONFIG_MEDIA_SUPPORT=m
 CONFIG_MEMORY=y
 CONFIG_MEMSTICK=m
 # CONFIG_MFD_SM501_GPIO is not set
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_TMIO is not set
 CONFIG_MII=y
 # CONFIG_MLX4_DEBUG is not set
diff --git a/debian.master/config/armhf/config.flavour.generic b/debian.master/config/armhf/config.flavour.generic
index 954b84f..4cc8ed6 100644
--- a/debian.master/config/armhf/config.flavour.generic
+++ b/debian.master/config/armhf/config.flavour.generic
@@ -23,6 +23,7 @@  CONFIG_GENERIC_PHY=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_TWL6040=y
 # CONFIG_HUGETLB_PAGE is not set
+CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MTD_SM_COMMON=m
 # CONFIG_MUSB_PIO_ONLY is not set
 CONFIG_PCI_SYSCALL=y
@@ -33,4 +34,5 @@  CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
 CONFIG_SOC_AM33XX=y
 CONFIG_SPI_PXA2XX_PCI=m
+CONFIG_USB_DWC3_OMAP=m
 CONFIG_VGASTATE=m
diff --git a/debian.master/config/armhf/config.flavour.generic-lpae b/debian.master/config/armhf/config.flavour.generic-lpae
index 40746a1..480ac01 100644
--- a/debian.master/config/armhf/config.flavour.generic-lpae
+++ b/debian.master/config/armhf/config.flavour.generic-lpae
@@ -23,6 +23,7 @@  CONFIG_GENERIC_PHY=m
 CONFIG_GPIO_GENERIC=m
 CONFIG_GPIO_TWL6040=m
 CONFIG_HUGETLB_PAGE=y
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MTD_SM_COMMON is not set
 CONFIG_MUSB_PIO_ONLY=y
 # CONFIG_PCI_SYSCALL is not set
@@ -33,4 +34,5 @@  CONFIG_SATA_AHCI_PLATFORM=m
 # CONFIG_SND_OPL3_LIB_SEQ is not set
 # CONFIG_SOC_AM33XX is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
+# CONFIG_USB_DWC3_OMAP is not set
 # CONFIG_VGASTATE is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 341d844..363aaf9 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3747,7 +3747,6 @@  CONFIG_MFD_TC3589X=y
 CONFIG_MFD_TC6387XB=y
 CONFIG_MFD_TC6393XB=y
 CONFIG_MFD_TIMBERDALE=m
-CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_TPS65090=y
 CONFIG_MFD_TPS65217=m
 CONFIG_MFD_TPS6586X=y
@@ -6613,7 +6612,6 @@  CONFIG_USB_DWC3_DUAL_ROLE=y
 # CONFIG_USB_DWC3_EXYNOS is not set
 # CONFIG_USB_DWC3_GADGET is not set
 # CONFIG_USB_DWC3_HOST is not set
-CONFIG_USB_DWC3_OMAP=m
 CONFIG_USB_DWC3_PCI=m
 CONFIG_USB_EG20T=m
 CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 64faab7..9768495 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -154,6 +154,7 @@  CONFIG_MEDIA_SUPPORT=m
 CONFIG_MEMORY=y
 CONFIG_MEMSTICK=m
 # CONFIG_MFD_SM501_GPIO is not set
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_TMIO is not set
 CONFIG_MII=m
 # CONFIG_MLX4_DEBUG is not set
@@ -333,6 +334,7 @@  CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CYPRESS_CY7C63=m
 CONFIG_USB_CYTHERM=m
 CONFIG_USB_DWC3=m
+# CONFIG_USB_DWC3_OMAP is not set
 CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 82717be..0fbaa1b 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -164,6 +164,7 @@  CONFIG_MEMORY=y
 # CONFIG_MEMORY_HOTREMOVE is not set
 CONFIG_MEMSTICK=m
 # CONFIG_MFD_SM501_GPIO is not set
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_TMIO is not set
 CONFIG_MII=m
 # CONFIG_MLX4_DEBUG is not set
@@ -364,6 +365,7 @@  CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CYPRESS_CY7C63=m
 CONFIG_USB_CYTHERM=m
 CONFIG_USB_DWC3=m
+# CONFIG_USB_DWC3_OMAP is not set
 CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_EHCI_HCD_PPC_OF=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 9d48e66..ecc2266 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -171,6 +171,7 @@  CONFIG_MD_RAID1=y
 CONFIG_MEMORY_HOTREMOVE=y
 # CONFIG_MEMSTICK is not set
 CONFIG_MFD_SM501_GPIO=y
+# CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_TMIO is not set
 CONFIG_MII=y
 CONFIG_MLX4_DEBUG=y