aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Campbell <ijc@debian.org>2015-05-29 06:33:10 +0000
committerIan Campbell <ijc@debian.org>2015-05-29 06:33:10 +0000
commit931ef5b117cfc4a31ecd84837d70b891e8919961 (patch)
treedd8ea0e3eb2d63cfdc6f445e384c8b3aece8b1f7
parent82b4acdbed058881019885d579bab80a3d94dfe7 (diff)
downloadkernel_replicant_linux-931ef5b117cfc4a31ecd84837d70b891e8919961.tar.gz
kernel_replicant_linux-931ef5b117cfc4a31ecd84837d70b891e8919961.tar.bz2
kernel_replicant_linux-931ef5b117cfc4a31ecd84837d70b891e8919961.zip
[armhf] Enable PCIe support for IMX6 boards.
svn path=/dists/sid/linux/; revision=22724
-rw-r--r--debian/changelog5
-rw-r--r--debian/config/armhf/config.armmp1
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e0c35bcb9ce2..343c79196ee4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
linux (4.0.4-2) UNRELEASED; urgency=medium
+ [ Ben Hutchings ]
* udeb: Remove i2o modules (fixes FTBFS on amd64) (Closes: #787004)
+ [ Ian Campbell ]
+ * [armhf] Enable PCIe support for IMX6 boards. Patch from Vagrant
+ Cascadian (Closes: #787029)
+
-- Ben Hutchings <ben@decadent.org.uk> Wed, 27 May 2015 21:36:56 +0100
linux (4.0.4-1) unstable; urgency=medium
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index cd0b3aa03ed5..1c5b7a2b5079 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -642,6 +642,7 @@ CONFIG_WLCORE_SDIO=m
## file: drivers/pci/host/Kconfig
##
CONFIG_PCI_MVEBU=y
+CONFIG_PCI_IMX6=y
CONFIG_PCI_TEGRA=y
##