diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-10 14:18:19 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-10 14:18:19 +0000 |
| commit | 1568be1da70dbee3a4033cd274bc85d9dfa60d0c (patch) | |
| tree | 08c7f86781226554900aea9d36b6563c30d7d466 /packages/linux | |
| parent | 9d2a68aadee35b8e3cc37597a50c7116057932fe (diff) | |
| parent | a958b7df1dd716b5716051485d215a7405b6afee (diff) | |
merge of '085fdb053bd524c93d21f1f230ab0b9ae7e0143f'
and 'a0e35a653641856b7a032c32949f7d3b2c23b5af'
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 |