aboutsummaryrefslogtreecommitdiffstats
path: root/packages/linux
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-01-10 15:08:35 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-01-10 15:08:35 +0000
commitf33f43df8f0ba7cb4571adc2473a8d53c8717e52 (patch)
tree56b446c6a6832e84f4deba0d02ca49596de809bc /packages/linux
parent803d7ee05e42c93a905664da11e2e88d8bd2edd2 (diff)
parentd69ad745213ae057e5ff4d7a400be07a02249f7b (diff)
downloadopenembedded-f33f43df8f0ba7cb4571adc2473a8d53c8717e52.tar.gz
merge of '0604b4d21148fa75a4b643461eb52fd689ac43c2'
and 'dd2c41928ef5fc90d06676100aedb5fc3d716efa'
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/linux-handhelds-2.6/magician/defconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig
index c47caaefd3..112a49f206 100644
--- a/packages/linux/linux-handhelds-2.6/magician/defconfig
+++ b/packages/linux/linux-handhelds-2.6/magician/defconfig
@@ -764,7 +764,7 @@ CONFIG_I2C_CHARDEV=m
#
# I2C Hardware Bus support
#
-CONFIG_I2C_PXA=m
+CONFIG_I2C_PXA=y
# CONFIG_I2C_PXA_SLAVE is not set
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
@@ -988,8 +988,8 @@ 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_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
# CONFIG_SND_DYNAMIC_MINORS is not set
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_VERBOSE_PROCFS=y