diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-03-15 22:56:30 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-03-15 22:56:30 +0000 |
| commit | 21757a5bad963331dcc33cc7ff109476269c03e7 (patch) | |
| tree | 317f27080d4d4886cd397a5fd1d5f9785a70f60d /packages/linux/ixp4xx-kernel | |
| parent | 8775c527e9c94cfa9c79781eb9112192b6f91fb7 (diff) | |
| parent | c83221df5af4799ba3529c470fcda84c76c0b8f7 (diff) | |
merge of 'a96c9acac99b5599d2b0fb0a518603646414d166'
and 'e8fe2283e0bda61a19e3e7f4cf561a638aa1b1fd'
Diffstat (limited to 'packages/linux/ixp4xx-kernel')
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.20/defconfig | 11 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.20/series | 5 |
2 files changed, 7 insertions, 9 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 diff --git a/packages/linux/ixp4xx-kernel/2.6.20/series b/packages/linux/ixp4xx-kernel/2.6.20/series index 6ceb7622ac..4b67723257 100644 --- a/packages/linux/ixp4xx-kernel/2.6.20/series +++ b/packages/linux/ixp4xx-kernel/2.6.20/series @@ -9,10 +9,7 @@ squashfs/squashfs-force-O2.patch squashfs/squashfs-lzma.patch squashfs/squashfs-Kconfig.patch squashfs/squashfs-Makefile.patch -00-linux-2.6.20.1.patch -01-fix-redboot-parse-oops.patch -02-fix-redboot-parse-regression.patch -03-improve-byteswap-redboot-parse.patch +00-linux-2.6.20.2.patch 07-remove-avila-ixdp425-setup.patch 08-avila-loft-setup.patch 09-avila-setup-pata.patch |