Added bq2415x driver

[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 dc3966a..ae64d0c 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,14 +73,6 @@
  # 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
@@ -386,15 +378,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
  #
@@ -445,6 +428,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
@@ -534,7 +528,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
@@ -545,6 +539,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