diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-10 14:22:49 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-10 14:22:49 +0000 |
| commit | d69ad745213ae057e5ff4d7a400be07a02249f7b (patch) | |
| tree | d036cb9dd7d6f74ac21323cdf39088fa3b11abc3 /packages/linux | |
| parent | a37c8e4783218af384e6c944f8650888d9f824df (diff) | |
| parent | 1568be1da70dbee3a4033cd274bc85d9dfa60d0c (diff) | |
merge of '0138f737ce953e134014ea8fbf6578cc8702b9f5'
and 'bd33d4ee671cf0bd42fbb0856d7dbb4e29347702'
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-handhelds-2.6/magician/defconfig | 6 |
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 |