6 files changed, 15 insertions, 15 deletions
diff --git a/arm-tegra-nvec-kconfig.patch b/arm-tegra-nvec-kconfig.patch
index 7436817e5..a3f568cd5 100644
--- a/arm-tegra-nvec-kconfig.patch
+++ b/arm-tegra-nvec-kconfig.patch
@@ -1,10 +1,10 @@
---- linux-2.6.42.noarch/drivers/staging/nvec/Kconfig.orig       2012-02-02 08:16:12.512727480 -0600
-+++ linux-2.6.42.noarch/drivers/staging/nvec/Kconfig    2012-02-01 18:44:56.674990109 -0600
+--- linux-2.6.42.noarch/drivers/staging/nvec/Kconfig.orig	2012-02-02 08:16:12.512727480 -0600
++++ linux-2.6.42.noarch/drivers/staging/nvec/Kconfig	2012-02-01 18:44:56.674990109 -0600
 @@ -1,6 +1,6 @@
  config MFD_NVEC
-        bool "NV Tegra Embedded Controller SMBus Interface"
--       depends on I2C && GPIOLIB && ARCH_TEGRA
-+       depends on I2C && GPIOLIB && ARCH_TEGRA && MFD_CORE=y
-        help
-            Say Y here to enable support for a nVidia compliant embedded
-            controller.
+ 	bool "NV Tegra Embedded Controller SMBus Interface"
+-	depends on I2C && GPIOLIB && ARCH_TEGRA
++	depends on I2C && GPIOLIB && ARCH_TEGRA && MFD_CORE=y
+ 	help
+ 	    Say Y here to enable support for a nVidia compliant embedded
+ 	    controller.
diff --git a/config-arm-generic b/config-arm-generic
index e87365e22..ea1390690 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -42,6 +42,8 @@ CONFIG_ARM_THUMB=y
 CONFIG_AEABI=y
 CONFIG_OABI_COMPAT=y
 
+CONFIG_HW_PERF_EVENTS=y
+
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 
 CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/sda1 rootdelay=20"
diff --git a/config-arm-imx b/config-arm-imx
index d1ce04e39..f4c7d26cb 100644
--- a/config-arm-imx
+++ b/config-arm-imx
@@ -39,7 +39,6 @@ CONFIG_ARM_ERRATA_411920=y
 CONFIG_PL310_ERRATA_588369=y
 CONFIG_PL310_ERRATA_727915=y
 CONFIG_ARM_ERRATA_364296=y
-CONFIG_HW_PERF_EVENTS=y
 CONFIG_RFKILL_GPIO=m
 CONFIG_PATA_IMX=m
 CONFIG_ETHERNET=y
diff --git a/config-arm-omap-generic b/config-arm-omap-generic
index 21063a2c7..473ae7a87 100644
--- a/config-arm-omap-generic
+++ b/config-arm-omap-generic
@@ -10,7 +10,6 @@ CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_BOOST is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
-# CONFIG_BLK_CGROUP is not set
 # CONFIG_SCHED_AUTOGROUP is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -143,9 +142,7 @@ CONFIG_LOCAL_TIMERS=y
 CONFIG_PREEMPT=y
 CONFIG_HZ=128
 # CONFIG_THUMB2_KERNEL is not set
-# CONFIG_OABI_COMPAT is not set
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
-CONFIG_HW_PERF_EVENTS=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_KSM is not set
 # CONFIG_CC_STACKPROTECTOR is not set
@@ -1036,7 +1033,6 @@ CONFIG_LIBCRC32C=y
 # CONFIG_LCD_LD9040 is not set
 # CONFIG_RTC_DRV_M41T93 is not set
 # CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_CGROUP_PERF is not set
 # CONFIG_OPROFILE is not set
 # CONFIG_OPROFILE is not set
 # CONFIG_PATA_ARASAN_CF is not set
diff --git a/config-arm-tegra b/config-arm-tegra
index f07164376..c024c2333 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -60,7 +60,6 @@ CONFIG_ARM_ERRATA_720789=y
 CONFIG_SMP_ON_UP=y
 CONFIG_LOCAL_TIMERS=y
 # CONFIG_THUMB2_KERNEL is not set
-CONFIG_HW_PERF_EVENTS=y
 # CONFIG_NEON is not set
 # CONFIG_RFKILL_GPIO is not set
 CONFIG_GPIO_GENERIC_PLATFORM=y
diff --git a/kernel.spec b/kernel.spec
index c79ba521c..68292e7b4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1335,7 +1335,7 @@ ApplyPatch linux-2.6-i386-nx-emulation.patch
 #
 #pplyPatch arm-omap-dt-compat.patch
 ApplyPatch arm-smsc-support-reading-mac-address-from-device-tree.patch
-#ApplyPatch arm-tegra-nvec-kconfig.patch
+ApplyPatch arm-tegra-nvec-kconfig.patch
 
 #
 # bugfixes to drivers and filesystems
@@ -2359,6 +2359,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Sun Feb 19 2012 Peter Robinson <pbrobinson@fedoraproject.org>
+- Further updates to ARM config
+- Fix and re-enable Tegra NVEC patch
+
 * Fri Feb 17 2012 Dave Jones <davej@redhat.com>
 - improve handling of null rate in LIS3LV02Dx accelerometer driver. (rhbz 785814)