X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Farm%2Fconfigs%2Fomap_h63xx_defconfig;h=b3f0625a22255294def13c2ae4f781c3f0cdbedd;hb=c872ebcdd22885f52cb1123472b0a7335f872785;hp=f9c6aef814c5c0a13e2e799abf8f7b3c7e20bb48;hpb=9535904a2435fe19cf346f809b0ed09162c4ff8e;p=linux-2.6-omap-h63xx.git

diff --git a/arch/arm/configs/omap_h63xx_defconfig b/arch/arm/configs/omap_h63xx_defconfig
index f9c6aef814c..b3f0625a222 100644
--- a/arch/arm/configs/omap_h63xx_defconfig
+++ b/arch/arm/configs/omap_h63xx_defconfig
@@ -480,6 +480,7 @@ CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIBTUART is not set
 # CONFIG_BT_HCIBRF6150 is not set
 CONFIG_BT_HCIVHCI=m
+CONFIG_BT_H6300=m
 # CONFIG_IEEE80211 is not set
 
 #
@@ -796,7 +797,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ELO is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
 # CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_OMAP is not set
+CONFIG_TOUCHSCREEN_OMAP=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=m
 
@@ -907,6 +908,7 @@ CONFIG_I2C_OMAP=m
 # CONFIG_SENSORS_DS1374 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
+CONFIG_PCA9535=y
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_RTC8564 is not set
@@ -1041,7 +1043,49 @@ CONFIG_LCD_DEVICE=y
 #
 # Sound
 #
-# CONFIG_SOUND is not set
+CONFIG_SOUND=m
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# ALSA ARM devices
+#
+# CONFIG_SND_OMAP_AIC23 is not set
+CONFIG_SND_OMAP_TSC2101=m
+
+#
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+
+#
+# PCMCIA devices
+#
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
 
 #
 # USB support
@@ -1072,6 +1116,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 #
 # USB Device Class drivers
 #
+# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
 CONFIG_USB_ACM=y
 # CONFIG_USB_PRINTER is not set
 
@@ -1238,8 +1283,8 @@ CONFIG_MMC_OMAP=y
 #
 # Synchronous Serial Interfaces (SSI)
 #
-# CONFIG_OMAP_UWIRE is not set
-# CONFIG_OMAP_TSC2101 is not set
+CONFIG_OMAP_UWIRE=y
+CONFIG_OMAP_TSC2101=y
 
 #
 # CBUS support