Revert "Disable errata 430973"

[kernel-power] / kernel-power-2.6.28 / debian / patches / rx51_defconfig.diff

diff --git a/kernel-power-2.6.28/debian/patches/rx51_defconfig.diff b/kernel-power-2.6.28/debian/patches/rx51_defconfig.diff
index 0962f84..9c78d5a 100644 (file)
--- a/kernel-power-2.6.28/debian/patches/rx51_defconfig.diff
+++ b/kernel-power-2.6.28/debian/patches/rx51_defconfig.diff
@@ -1,5 +1,5 @@
---- kernel-power-2.6.28/arch/arm/configs/rx51_defconfig        2011-09-22 10:32:29.950344915 +0200
-+++ kernel-power-2.6.28/arch/arm/configs/rx51_defconfig        2011-09-22 10:34:00.320344016 +0200
+--- kernel-power-2.6.28/arch/arm/configs/rx51_defconfig        2012-01-07 10:28:59.445346942 +0100
++++ kernel-power-2.6.28/arch/arm/configs/rx51_defconfig        2012-01-07 10:30:09.121345857 +0100
 @@ -36,17 +36,21 @@
  CONFIG_LOCK_KERNEL=y
  CONFIG_INIT_ENV_ARG_LIMIT=32
@@ -232,9 +232,10 @@
 +CONFIG_NETFILTER_XT_MATCH_MAC=m
  # CONFIG_NETFILTER_XT_MATCH_MARK is not set
 -# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
- # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
 -# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
++CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
++CONFIG_NETFILTER_XT_MATCH_OWNER=m
 +CONFIG_NETFILTER_XT_MATCH_POLICY=m
  # CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
  # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
@@ -385,15 +386,6 @@
  CONFIG_NL80211=y
  CONFIG_WIRELESS_OLD_REGULATORY=y
  CONFIG_WIRELESS_EXT=y
-@@ -553,7 +696,7 @@
- # CONFIG_MAC80211_RC_DEFAULT_PID is not set
- CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
- CONFIG_MAC80211_RC_DEFAULT="minstrel"
--# CONFIG_MAC80211_MESH is not set
-+CONFIG_MAC80211_MESH=y
- # CONFIG_MAC80211_LEDS is not set
- # CONFIG_MAC80211_DEBUGFS is not set
- # CONFIG_MAC80211_DEBUG_MENU is not set
 @@ -592,9 +735,9 @@
  # User Modules And Translation Layers
  #
@@ -444,6 +436,17 @@
  # CONFIG_BLK_DEV_UB is not set
  CONFIG_BLK_DEV_RAM=y
  CONFIG_BLK_DEV_RAM_COUNT=16
+@@ -865,8 +865,8 @@
+ CONFIG_BLK_DEV_SD=m
+ # CONFIG_CHR_DEV_ST is not set
+ # CONFIG_CHR_DEV_OSST is not set
+-# CONFIG_BLK_DEV_SR is not set
+-# CONFIG_CHR_DEV_SG is not set
++CONFIG_BLK_DEV_SR=m
++CONFIG_CHR_DEV_SG=m
+ # CONFIG_CHR_DEV_SCH is not set
+ 
+ #
 @@ -736,8 +889,20 @@
  # CONFIG_SCSI_DEBUG is not set
  # CONFIG_SCSI_DH is not set
@@ -533,7 +536,7 @@
  CONFIG_DEVKMEM=y
  # CONFIG_SERIAL_NONSTANDARD is not set
  
-@@ -998,7 +1196,12 @@
+@@ -998,7 +1196,13 @@
  # CONFIG_GPIO_MAX7301 is not set
  # CONFIG_GPIO_MCP23S08 is not set
  # CONFIG_W1 is not set
@@ -544,6 +547,7 @@
 +# CONFIG_BATTERY_DS2760 is not set
 +# CONFIG_TWL4030_BCI_BATTERY is not set
 +CONFIG_BATTERY_BQ27x00=m
++CONFIG_CHARGER_BQ2415X=m
  CONFIG_HWMON=y
  # CONFIG_HWMON_VID is not set
  # CONFIG_SENSORS_AD7414 is not set