summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-arm-generic1
-rw-r--r--config-arm-omap3
-rw-r--r--config-arm-tegra2
-rw-r--r--config-armv73
-rw-r--r--kernel.spec1
5 files changed, 7 insertions, 3 deletions
diff --git a/config-arm-generic b/config-arm-generic
index b6be5388a..088a56ebb 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -97,6 +97,7 @@ CONFIG_LEDS_GPIO=m
CONFIG_LBDAF=y
+CONFIG_GPIOLIB=y
CONFIG_RFKILL_GPIO=m
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_GPIO_GENERIC_PLATFORM=m
diff --git a/config-arm-omap b/config-arm-omap
index 89ecea347..7716b2b7e 100644
--- a/config-arm-omap
+++ b/config-arm-omap
@@ -153,7 +153,6 @@ CONFIG_WL_TI=y
CONFIG_WLCORE_SDIO=m
CONFIG_TI_ST=m
# CONFIG_TI_CPSW is not set
-CONFIG_GPIOLIB=y
CONFIG_MTD_NAND_OMAP2=y
CONFIG_MTD_NAND_OMAP_PREFETCH=y
CONFIG_MTD_NAND_OMAP_PREFETCH_DMA=y
@@ -188,7 +187,7 @@ CONFIG_TI_DAVINCI_CPDMA=m
CONFIG_LEDS_PWM=m
CONFIG_MTD_ONENAND_OMAP2=y
CONFIG_HDQ_MASTER_OMAP=m
-CONFIG_I2C_OMAP=y
+CONFIG_I2C_OMAP=m
CONFIG_SPI_OMAP24XX=y
CONFIG_MFD_OMAP_USB_HOST=y
CONFIG_MFD_WL1273_CORE=m
diff --git a/config-arm-tegra b/config-arm-tegra
index bf31669f3..894b5dbef 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -23,7 +23,7 @@ CONFIG_ARM_CPU_TOPOLOGY=y
CONFIG_TEGRA_IOMMU_GART=y
CONFIG_TEGRA_IOMMU_SMMU=y
-CONFIG_I2C_TEGRA=y
+CONFIG_I2C_TEGRA=m
# This block is temporary until we work out why the MMC modules don't work as modules
CONFIG_MMC=y
diff --git a/config-armv7 b/config-armv7
index 6de165472..c77f129fb 100644
--- a/config-armv7
+++ b/config-armv7
@@ -179,6 +179,7 @@ CONFIG_CRYPTO_DEV_PICOXCELL=m
# ST Ericsson
# CONFIG_I2C_NOMADIK is not set
+
# General ARM drivers
# Device tree
CONFIG_OF=y
@@ -193,7 +194,9 @@ CONFIG_OF_PCI=y
CONFIG_OF_PCI_IRQ=y
CONFIG_I2C_MUX_PINCTRL=m
CONFIG_OF_MDIO=m
+
CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_GPIOLIB=y
# MMC/SD
CONFIG_MMC=y
diff --git a/kernel.spec b/kernel.spec
index 12594044e..0ba866e63 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2368,6 +2368,7 @@ fi
%changelog
* Thu Nov 29 2012 Peter Robinson <pbrobinson@fedoraproject.org>
- Hopefully fix the ARM unified kernel build
+- Update some ARM GPIO and I2C configs
* Tue Nov 27 2012 Josh Boyer <jwboyer@redhat.com>
- Update patches for 8139cp issues from David Woodhouse (rhbz 851278)