summaryrefslogtreecommitdiff
path: root/packages/linux/linux-handhelds-2.6/magician
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-01-11 05:01:57 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-01-11 05:01:57 +0000
commit63b28eccf03090e6ffbc22b43b7e2980bcaa6ac0 (patch)
tree9c782475d9fb0272145ff339f3d2e22a0a9a06f7 /packages/linux/linux-handhelds-2.6/magician
parenta5bfba15d1d4bfb1f2691d1d8fa47a6511dcccf7 (diff)
parent3a5d5af1f6f0b43bc46535d82f5dcffc06ec19c6 (diff)
merge of '242e744e01fe3fbbbae94031b14a816bec5caeae'
and 'cec9dea27c828bc6ef75f6e0fe0254ada1f011cb'
Diffstat (limited to 'packages/linux/linux-handhelds-2.6/magician')
-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