aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2014-04-27 13:27:52 +0000
committerBen Hutchings <benh@debian.org>2014-04-27 13:27:52 +0000
commit68b80a295e88c5e82fe106c86de95ebfcaff288e (patch)
treeaff82304d9db2a9b593a1169b30dc13552fa2cc5
parent4edd0d432b7f3a5879e2d45b6b9bc9ec5fec8c5b (diff)
downloadkernel_replicant_linux-68b80a295e88c5e82fe106c86de95ebfcaff288e.tar.gz
kernel_replicant_linux-68b80a295e88c5e82fe106c86de95ebfcaff288e.tar.bz2
kernel_replicant_linux-68b80a295e88c5e82fe106c86de95ebfcaff288e.zip
[armhf] Enable RTC_DRV_SUNXI, USB_EHCI_HCD_PLATFORM, USB_OHCI_HCD_PLATFORM and CONFIG_SUNXI_WATCHDOG as modules
svn path=/dists/trunk/linux/; revision=21272
-rw-r--r--debian/changelog2
-rw-r--r--debian/config/armhf/config.armmp4
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 2f3c1fe86a05..fce8aed3593a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ linux (3.14.2-1~exp1) UNRELEASED; urgency=medium
* [x86] Enable X86_INTEL_LPSS (Closes: #745331)
* [x86] thinkpad_acpi: Add support for X1 Carbon 2nd generation's adaptive
keyboard (Closes: #745252)
+ * [armhf] Enable RTC_DRV_SUNXI, USB_EHCI_HCD_PLATFORM, USB_OHCI_HCD_PLATFORM
+ and CONFIG_SUNXI_WATCHDOG as modules
-- Ben Hutchings <ben@decadent.org.uk> Sun, 20 Apr 2014 21:54:54 +0100
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index c45b1e19da4b..712197fef883 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -534,6 +534,7 @@ CONFIG_RTC_DRV_OMAP=m
CONFIG_RTC_DRV_PL030=m
CONFIG_RTC_DRV_PL031=m
CONFIG_RTC_DRV_VT8500=m
+CONFIG_RTC_DRV_SUNXI=m
CONFIG_RTC_DRV_MV=m
CONFIG_RTC_DRV_MC13XXX=m
CONFIG_RTC_DRV_MXC=m
@@ -629,8 +630,10 @@ CONFIG_USB_G_NOKIA=m
CONFIG_USB_EHCI_HCD=m
CONFIG_USB_EHCI_MXC=m
CONFIG_USB_EHCI_HCD_OMAP=y
+CONFIG_USB_EHCI_HCD_PLATFORM=m
CONFIG_USB_OHCI_HCD=m
CONFIG_USB_OHCI_HCD_OMAP3=y
+CONFIG_USB_OHCI_HCD_PLATFORM=m
##
## file: drivers/usb/musb/Kconfig
@@ -699,6 +702,7 @@ CONFIG_VIRTIO_MMIO=m
CONFIG_DA9052_WATCHDOG=m
CONFIG_ARM_SP805_WATCHDOG=m
CONFIG_OMAP_WATCHDOG=m
+CONFIG_SUNXI_WATCHDOG=m
CONFIG_TWL4030_WATCHDOG=m
CONFIG_IMX2_WDT=m