diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-03-16 16:54:31 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-03-16 16:54:31 +0000 |
| commit | d533fcda97f0fd7f8ed44619da3a7b87537b9ae8 (patch) | |
| tree | 62351538698fc3464b05763637d37ed5da16d9e8 /packages/linux/ixp4xx-kernel/2.6.20/defconfig | |
| parent | 86c228e54834a26fa885386484a476079039e3e5 (diff) | |
| parent | fd25fcd294309185346b0f4c7a18b94b0b408d35 (diff) | |
merge of 'be6200db697731daae7d15a8ac5ca6b54f62a6d0'
and 'e68c7275015e0b7f4e92aa7483c3d7038567a3dc'
Diffstat (limited to 'packages/linux/ixp4xx-kernel/2.6.20/defconfig')
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.20/defconfig | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/packages/linux/ixp4xx-kernel/2.6.20/defconfig b/packages/linux/ixp4xx-kernel/2.6.20/defconfig index f787d9d1dc..7b32c7e723 100644 --- a/packages/linux/ixp4xx-kernel/2.6.20/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.20/defconfig @@ -30,7 +30,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 # General setup # CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y # CONFIG_IPC_NS is not set @@ -235,7 +235,6 @@ CONFIG_FPE_NWFPE=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set -# CONFIG_ARTHUR is not set # # Power management options @@ -481,18 +480,20 @@ CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=m CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y -# CONFIG_BT_HIDP is not set +CONFIG_BT_HIDP=m # # Bluetooth device drivers # CONFIG_BT_HCIUSB=m CONFIG_BT_HCIUSB_SCO=y -# CONFIG_BT_HCIUART is not set +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIBCM203X=m # CONFIG_BT_HCIBPA10X is not set # CONFIG_BT_HCIBFUSB is not set -# CONFIG_BT_HCIVHCI is not set +CONFIG_BT_HCIVHCI=m CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m |