diff --git a/debian/changelog b/debian/changelog index 7c40fc819..2d041299f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,10 @@ linux (3.10.10-1) UNRELEASED; urgency=low * aufs: mvdown, don't let unprivileged users provoke a WARNING * [x86] ACPI: Re-enable ACPI_HOTPLUG_MEMORY as built-in + [ Ian Campbell ] + * [armel]: Enable MVMDIO and USB_EHCI_HCD_ORION on Kirkwood and Orion + (Closes: #719680) + -- Ben Hutchings Fri, 30 Aug 2013 02:31:22 +0100 linux (3.10.7-1) unstable; urgency=low diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index ea548269a..73875a610 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -447,6 +447,8 @@ CONFIG_MTD_UBI=y ## file: drivers/net/ethernet/marvell/Kconfig ## CONFIG_MV643XX_ETH=m +CONFIG_MVMDIO=m + # CONFIG_SKGE is not set # CONFIG_SKY2 is not set @@ -630,6 +632,7 @@ CONFIG_USB_SPEEDTOUCH=m ## file: drivers/usb/host/Kconfig ## CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_HCD_ORION=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y # CONFIG_USB_ISP116X_HCD is not set diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x index 54890f2e7..de9147fa5 100644 --- a/debian/config/armel/config.orion5x +++ b/debian/config/armel/config.orion5x @@ -398,6 +398,7 @@ CONFIG_MTD_NAND_ORION=y ## file: drivers/net/ethernet/marvell/Kconfig ## CONFIG_MV643XX_ETH=m +CONFIG_MVMDIO=m # CONFIG_SKGE is not set # CONFIG_SKY2 is not set @@ -546,6 +547,7 @@ CONFIG_USB_SPEEDTOUCH=m ## file: drivers/usb/host/Kconfig ## CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_HCD_ORION=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y # CONFIG_USB_ISP116X_HCD is not set