From d974a4b4e7d0ded7620bf9f0e966460e192ae4fd Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Nov 29 2012 14:12:21 +0000
Subject: Update some ARM GPIO and I2C configs


---

diff --git a/config-arm-generic b/config-arm-generic
index 625c611..d44eda5 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -101,6 +101,7 @@ CONFIG_LBDAF=y
 CONFIG_RFKILL_GPIO=m
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIO_GENERIC_PLATFORM=m
+CONFIG_GPIOLIB=y
 CONFIG_PINCTRL_SINGLE=m
 
 CONFIG_USB_ULPI=y
diff --git a/config-arm-omap b/config-arm-omap
index b35ccd1..8e314ce 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 748edc5..78ddf07 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -24,7 +24,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/kernel.spec b/kernel.spec
index f9d9f4f..29369c4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2446,6 +2446,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Thu Nov 29 2012 Peter Robinson <pbrobinson@fedoraproject.org>
+- 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)