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 2ae1990..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
@@ -73,6 +73,14 @@
  # CONFIG_CPU_ICACHE_DISABLE is not set
  # CONFIG_CPU_DCACHE_DISABLE is not set
  # CONFIG_CPU_BPREDICT_DISABLE is not set
+@@ -279,6 +283,7 @@
+ # CONFIG_PCI_SYSCALL is not set
+ # CONFIG_ARCH_SUPPORTS_MSI is not set
+ # CONFIG_PCCARD is not set
++CONFIG_ARM_ERRATA_430973=y
+ 
+ #
+ # Kernel Features
 @@ -338,10 +343,10 @@
  # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
  # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
@@ -528,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
@@ -539,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