[armhf/mx5] Fix up config for recent renaming, merging, removal, and other mess

svn path=/dists/trunk/linux/; revision=19631

debian/changelog

@@ -18,6 +18,12 @@ linux (3.7.1-1~experimental.1) UNRELEASED; urgency=low
   * staging: Enable RTLLIB; re-enable RTL8192E as module
   * media: Enable IR_TTUSBIR as module, replacing LIRC_TTUSBIR
   * media: Enable VIDEO_STK1160 as module, replacing EASYCAP
+  * [armhf/mx5] Update configuration:
+    - Enable MACH_IMX51_DT, replacing MACH_MX51_EFIKAMX (but not fully
+      working in this kernel version)
+    - Enable SOC_IMX53, replacing MACH_MX53_{EVK,SMD,LOCO,ARD}
+    - Re-enable MFD_MC13XXX_SPI (formerly included in MFD_MC13XXX)
+    - Enable PWM and re-enable PWM_IMX (formerly known as MXC_PWM)
 
  -- maximilian attems <maks@debian.org>  Thu, 06 Dec 2012 18:14:33 +0100
 

debian/config/armhf/config.mx5

@@ -21,11 +21,9 @@ CONFIG_NEON=y
 ##
 ## file: arch/arm/mach-imx/Kconfig
 ##
-CONFIG_MACH_MX51_EFIKAMX=y
-CONFIG_MACH_MX53_EVK=y
-CONFIG_MACH_MX53_SMD=y
-CONFIG_MACH_MX53_LOCO=y
-CONFIG_MACH_MX53_ARD=y
+#. CONFIG_MACH_MX51_EFIKAMX is gone 
+CONFIG_MACH_IMX51_DT=y
+CONFIG_SOC_IMX53=y
 
 ##
 ## file: drivers/ata/Kconfig
@@ -68,6 +66,11 @@ CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_TRIGGER_GPIO=y
 
+##
+## file: drivers/mfd/Kconfig
+##
+CONFIG_MFD_MC13XXX_SPI=y
+
 ##
 ## file: drivers/mmc/Kconfig
 ##
@@ -96,6 +99,12 @@ CONFIG_MTD=m
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 
+##
+## file: drivers/pwm/Kconfig
+##
+CONFIG_PWM=y
+CONFIG_PWM_IMX=y
+
 ##
 ## file: drivers/regulator/Kconfig
 ##