X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=kernel-power-2.6.28%2Fdebian%2Fpatches%2Frx51_defconfig.diff;h=dbcb6a7621a367bd3a828928405388e1b7673670;hb=afa6135f29f7615579c5c93c993d748ded38ee0c;hp=c5f92edf6dd24cc31a0881848edb9533341a507d;hpb=255cb48d0ca0c98f0609253bceee3d01d163c100;p=kernel-power

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 c5f92ed..dbcb6a7 100644
--- a/kernel-power-2.6.28/debian/patches/rx51_defconfig.diff
+++ b/kernel-power-2.6.28/debian/patches/rx51_defconfig.diff
@@ -1,11 +1,11 @@
---- kernel-power-2.6.28/arch/arm/configs/rx51_defconfig	2011-05-03 20:21:15.000000000 +0200
-+++ kernel-power-2.6.28/arch/arm/configs/rx51_defconfig	2011-04-16 11:34:24.000000000 +0200
+--- kernel-power/arch/arm/configs/rx51_defconfig.orig	2012-09-12 13:07:32.411477937 +0200
++++ kernel-power/arch/arm/configs/rx51_defconfig	2012-09-12 13:15:10.371462598 +0200
 @@ -36,17 +36,21 @@
  CONFIG_LOCK_KERNEL=y
  CONFIG_INIT_ENV_ARG_LIMIT=32
  CONFIG_LOCALVERSION=""
 -CONFIG_LOCALVERSION_AUTO=y
-+#CONFIG_LOCALVERSION_AUTO is not set
++# CONFIG_LOCALVERSION_AUTO is not set
  CONFIG_SWAP=y
  CONFIG_SYSVIPC=y
  CONFIG_SYSVIPC_SYSCTL=y
@@ -203,52 +203,72 @@
  CONFIG_NETFILTER_XTABLES=m
 -# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
 -# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+-# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
+-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
 +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
++CONFIG_NETFILTER_XT_TARGET_DSCP=m
 +CONFIG_NETFILTER_XT_TARGET_MARK=m
- # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
- # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
- # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
--# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
++CONFIG_NETFILTER_XT_TARGET_NFLOG=m
++CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
++CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
- # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
++CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
++CONFIG_NETFILTER_XT_MATCH_COMMENT=m
++CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
- # CONFIG_NETFILTER_XT_MATCH_DCCP is not set
- # CONFIG_NETFILTER_XT_MATCH_DSCP is not set
- # CONFIG_NETFILTER_XT_MATCH_ESP is not set
- # CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
--# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
++CONFIG_NETFILTER_XT_MATCH_DCCP=m
++CONFIG_NETFILTER_XT_MATCH_DSCP=m
++CONFIG_NETFILTER_XT_MATCH_ESP=m
++CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 +CONFIG_NETFILTER_XT_MATCH_HELPER=m
 +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
- # CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
--# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
--# CONFIG_NETFILTER_XT_MATCH_MAC is not set
++CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 +CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 +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_MARK=m
 +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
- # CONFIG_NETFILTER_XT_MATCH_OWNER is not set
--# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
++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
- # CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
- # CONFIG_NETFILTER_XT_MATCH_REALM is not set
- # CONFIG_NETFILTER_XT_MATCH_RECENT is not set
- # CONFIG_NETFILTER_XT_MATCH_SCTP is not set
++CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
++CONFIG_NETFILTER_XT_MATCH_QUOTA=m
++CONFIG_NETFILTER_XT_MATCH_RATEEST=m
++CONFIG_NETFILTER_XT_MATCH_REALM=m
++CONFIG_NETFILTER_XT_MATCH_RECENT=m
++CONFIG_NETFILTER_XT_MATCH_SCTP=m
 +CONFIG_NETFILTER_XT_MATCH_STATE=m
- # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
- # CONFIG_NETFILTER_XT_MATCH_STRING is not set
--# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
++CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
++CONFIG_NETFILTER_XT_MATCH_STRING=m
 +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
- # CONFIG_NETFILTER_XT_MATCH_TIME is not set
--# CONFIG_NETFILTER_XT_MATCH_U32 is not set
++CONFIG_NETFILTER_XT_MATCH_TIME=m
 +CONFIG_NETFILTER_XT_MATCH_U32=m
  # CONFIG_IP_VS is not set
  
@@ -282,8 +302,8 @@
 +CONFIG_NF_NAT_PROTO_GRE=m
 +CONFIG_NF_NAT_FTP=m
 +CONFIG_NF_NAT_IRC=m
-+# CONFIG_NF_NAT_TFTP is not set
-+# CONFIG_NF_NAT_AMANDA is not set
++CONFIG_NF_NAT_TFTP=m
++CONFIG_NF_NAT_AMANDA=m
 +CONFIG_NF_NAT_PPTP=m
 +CONFIG_NF_NAT_H323=m
 +CONFIG_NF_NAT_SIP=m
@@ -385,15 +405,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 +455,17 @@
  # CONFIG_BLK_DEV_UB is not set
  CONFIG_BLK_DEV_RAM=y
  CONFIG_BLK_DEV_RAM_COUNT=16
+@@ -710,8 +863,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
@@ -524,7 +546,16 @@
  CONFIG_INPUT_EVDEV=y
  # CONFIG_INPUT_EVBUG is not set
  
-@@ -998,7 +1196,12 @@
+@@ -872,7 +1070,7 @@
+ CONFIG_CONSOLE_TRANSLATIONS=y
+ CONFIG_VT_CONSOLE=y
+ CONFIG_HW_CONSOLE=y
+-# CONFIG_VT_HW_CONSOLE_BINDING is not set
++CONFIG_VT_HW_CONSOLE_BINDING=y
+ CONFIG_DEVKMEM=y
+ # CONFIG_SERIAL_NONSTANDARD is not set
+ 
+@@ -998,7 +1196,14 @@
  # CONFIG_GPIO_MAX7301 is not set
  # CONFIG_GPIO_MCP23S08 is not set
  # CONFIG_W1 is not set
@@ -535,10 +566,12 @@
 +# CONFIG_BATTERY_DS2760 is not set
 +# CONFIG_TWL4030_BCI_BATTERY is not set
 +CONFIG_BATTERY_BQ27x00=m
++CONFIG_CHARGER_BQ2415X=m
++CONFIG_BATTERY_RX51=m
  CONFIG_HWMON=y
  # CONFIG_HWMON_VID is not set
  # CONFIG_SENSORS_AD7414 is not set
-@@ -1218,8 +1421,31 @@
+@@ -1218,8 +1422,31 @@
  CONFIG_VIDEO_SMIAREGS=m
  # CONFIG_SOC_CAMERA is not set
  CONFIG_V4L_USB_DRIVERS=y
@@ -572,7 +605,7 @@
  # CONFIG_VIDEO_PVRUSB2 is not set
  # CONFIG_VIDEO_EM28XX is not set
  # CONFIG_VIDEO_USBVISION is not set
-@@ -1250,9 +1476,10 @@
+@@ -1250,9 +1477,10 @@
  # Graphics support
  #
  CONFIG_PVR=m
@@ -586,7 +619,7 @@
  # CONFIG_VGASTATE is not set
  # CONFIG_VIDEO_OUTPUT_CONTROL is not set
  CONFIG_FB=y
-@@ -1324,7 +1551,12 @@
+@@ -1324,7 +1552,12 @@
  #
  # CONFIG_VGA_CONSOLE is not set
  CONFIG_DUMMY_CONSOLE=y
@@ -595,12 +628,26 @@
 +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 +# CONFIG_FONTS is not set
-+CONFIG_FONT_8x8=m
-+CONFIG_FONT_8x16=m
++CONFIG_FONT_8x8=y
++CONFIG_FONT_8x16=y
  # CONFIG_LOGO is not set
  CONFIG_SOUND=y
  # CONFIG_SOUND_OSS_CORE is not set
-@@ -1402,8 +1634,8 @@
+@@ -1347,7 +1580,12 @@
+ # CONFIG_SND_MPU401 is not set
+ CONFIG_SND_ARM=y
+ CONFIG_SND_SPI=y
+-# CONFIG_SND_USB is not set
++CONFIG_SND_USB=y
++CONFIG_SND_USB_AUDIO=m
++CONFIG_SND_USB_USX2Y=m
++CONFIG_SND_USB_CAIAQ=m
++CONFIG_SND_USB_CAIAQ_INPUT=y
++CONFIG_SND_USB_US122L=m
+ CONFIG_SND_SOC=y
+ CONFIG_SND_OMAP_SOC=y
+ CONFIG_SND_OMAP_SOC_MCBSP=y
+@@ -1402,8 +1640,8 @@
  CONFIG_USB_ARCH_HAS_OHCI=y
  CONFIG_USB_ARCH_HAS_EHCI=y
  CONFIG_USB=y
@@ -611,7 +658,7 @@
  
  #
  # Miscellaneous USB options
-@@ -1413,8 +1645,8 @@
+@@ -1413,8 +1651,8 @@
  CONFIG_USB_DYNAMIC_MINORS=y
  CONFIG_USB_SUSPEND=y
  CONFIG_USB_OTG=y
@@ -622,7 +669,7 @@
  CONFIG_USB_MON=y
  # CONFIG_USB_WUSB is not set
  # CONFIG_USB_WUSB_CBAF is not set
-@@ -1449,10 +1681,10 @@
+@@ -1449,10 +1687,10 @@
  #
  # USB Device Class drivers
  #
@@ -637,7 +684,7 @@
  
  #
  # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
-@@ -1486,7 +1718,49 @@
+@@ -1486,7 +1724,49 @@
  #
  # USB port drivers
  #
@@ -688,7 +735,7 @@
  
  #
  # USB Miscellaneous drivers
-@@ -1534,14 +1808,15 @@
+@@ -1534,14 +1814,15 @@
  # CONFIG_USB_GADGET_DUMMY_HCD is not set
  CONFIG_USB_GADGET_DUALSPEED=y
  CONFIG_USB_ZERO=m
@@ -708,7 +755,7 @@
  # CONFIG_USB_CDC_COMPOSITE is not set
  CONFIG_USB_G_NOKIA=m
  CONFIG_USB_G_SOFTUPD=m
-@@ -1550,9 +1825,12 @@
+@@ -1550,9 +1831,12 @@
  # OTG and related infrastructure
  #
  CONFIG_USB_OTG_UTILS=y
@@ -722,7 +769,7 @@
  CONFIG_MMC=m
  # CONFIG_MMC_DEBUG is not set
  CONFIG_MMC_UNSAFE_RESUME=y
-@@ -1595,6 +1873,7 @@
+@@ -1595,6 +1879,7 @@
  CONFIG_LEDS_TRIGGER_HEARTBEAT=y
  # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
  # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
@@ -730,7 +777,7 @@
  CONFIG_RTC_LIB=y
  CONFIG_RTC_CLASS=m
  
-@@ -1680,14 +1959,28 @@
+@@ -1680,14 +1965,28 @@
  # CONFIG_EXT2_FS_XIP is not set
  CONFIG_EXT3_FS=m
  # CONFIG_EXT3_FS_XATTR is not set
@@ -762,7 +809,7 @@
  # CONFIG_OCFS2_FS is not set
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
-@@ -1699,14 +1992,17 @@
+@@ -1699,14 +1998,17 @@
  CONFIG_QFMT_V2=y
  CONFIG_QUOTACTL=y
  # CONFIG_AUTOFS_FS is not set
@@ -783,7 +830,7 @@
  
  #
  # DOS/FAT/NT Filesystems
-@@ -1716,7 +2012,9 @@
+@@ -1716,7 +2018,9 @@
  CONFIG_VFAT_FS=m
  CONFIG_FAT_DEFAULT_CODEPAGE=437
  CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
@@ -794,7 +841,7 @@
  
  #
  # Pseudo filesystems
-@@ -1731,12 +2029,19 @@
+@@ -1731,12 +2035,19 @@
  # CONFIG_CONFIGFS_FS is not set
  
  #
@@ -815,7 +862,7 @@
  # CONFIG_BEFS_FS is not set
  # CONFIG_BFS_FS is not set
  # CONFIG_EFS_FS is not set
-@@ -1748,6 +2053,9 @@
+@@ -1748,6 +2059,9 @@
  CONFIG_UBIFS_FS_ZLIB=y
  # CONFIG_UBIFS_FS_DEBUG is not set
  CONFIG_CRAMFS=y
@@ -825,7 +872,7 @@
  # CONFIG_VXFS_FS is not set
  # CONFIG_MINIX_FS is not set
  # CONFIG_OMFS_FS is not set
-@@ -1771,7 +2079,12 @@
+@@ -1771,7 +2085,12 @@
  CONFIG_RPCSEC_GSS_KRB5=m
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  # CONFIG_SMB_FS is not set
@@ -839,7 +886,7 @@
  # CONFIG_NCP_FS is not set
  # CONFIG_CODA_FS is not set
  # CONFIG_AFS_FS is not set
-@@ -1795,14 +2108,14 @@
+@@ -1795,14 +2114,14 @@
  # CONFIG_ULTRIX_PARTITION is not set
  # CONFIG_SUN_PARTITION is not set
  # CONFIG_KARMA_PARTITION is not set
@@ -856,7 +903,7 @@
  # CONFIG_NLS_CODEPAGE_852 is not set
  # CONFIG_NLS_CODEPAGE_855 is not set
  # CONFIG_NLS_CODEPAGE_857 is not set
-@@ -1833,10 +2146,10 @@
+@@ -1833,10 +2152,10 @@
  # CONFIG_NLS_ISO8859_9 is not set
  # CONFIG_NLS_ISO8859_13 is not set
  # CONFIG_NLS_ISO8859_14 is not set
@@ -869,7 +916,7 @@
  # CONFIG_DLM is not set
  
  #
-@@ -1929,17 +2242,20 @@
+@@ -1929,17 +2248,20 @@
  # CONFIG_CRYPTO_FIPS is not set
  CONFIG_CRYPTO_ALGAPI=y
  CONFIG_CRYPTO_ALGAPI2=y
@@ -892,7 +939,7 @@
  # CONFIG_CRYPTO_TEST is not set
  
  #
-@@ -1947,7 +2263,7 @@
+@@ -1947,7 +2269,7 @@
  #
  # CONFIG_CRYPTO_CCM is not set
  # CONFIG_CRYPTO_GCM is not set
@@ -901,7 +948,13 @@
  
  #
  # Block modes
-@@ -1963,7 +2279,7 @@
+@@ -1958,12 +2280,12 @@
+ CONFIG_CRYPTO_ECB=y
+ # CONFIG_CRYPTO_LRW is not set
+ CONFIG_CRYPTO_PCBC=m
+-# CONFIG_CRYPTO_XTS is not set
++CONFIG_CRYPTO_XTS=m
+ 
  #
  # Hash modes
  #
@@ -910,7 +963,7 @@
  # CONFIG_CRYPTO_XCBC is not set
  
  #
-@@ -1977,9 +2293,9 @@
+@@ -1977,9 +2299,9 @@
  # CONFIG_CRYPTO_RMD160 is not set
  # CONFIG_CRYPTO_RMD256 is not set
  # CONFIG_CRYPTO_RMD320 is not set
@@ -923,7 +976,7 @@
  # CONFIG_CRYPTO_TGR192 is not set
  # CONFIG_CRYPTO_WP512 is not set
  
-@@ -1989,7 +2305,7 @@
+@@ -1989,7 +2311,7 @@
  CONFIG_CRYPTO_AES=y
  # CONFIG_CRYPTO_ANUBIS is not set
  CONFIG_CRYPTO_ARC4=y
@@ -932,7 +985,7 @@
  # CONFIG_CRYPTO_CAMELLIA is not set
  # CONFIG_CRYPTO_CAST5 is not set
  # CONFIG_CRYPTO_CAST6 is not set
-@@ -2000,7 +2316,8 @@
+@@ -2000,7 +2322,8 @@
  # CONFIG_CRYPTO_SEED is not set
  # CONFIG_CRYPTO_SERPENT is not set
  # CONFIG_CRYPTO_TEA is not set
@@ -942,7 +995,7 @@
  
  #
  # Compression
-@@ -2021,7 +2338,7 @@
+@@ -2021,7 +2344,7 @@
  CONFIG_CRC_CCITT=y
  CONFIG_CRC16=y
  # CONFIG_CRC_T10DIF is not set