diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2005-04-19 11:51:02 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2005-04-19 11:51:02 +0000 |
| commit | 0c7bd9ba4da5dbf31c5b2b704c135dcb385a6bd3 (patch) | |
| tree | 1cf56a3614903a01adc3764e1f28cd53a63b136d /packages/linux/linux-openzaurus-2.6.11/defconfig-c7x0 | |
| parent | 4de5c6026e00ad4dfd9fbb072b47bec4e2d97b55 (diff) | |
merge conflicts
2005/04/19 13:43:30+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/04/19 13:43:18+02:00 uni-frankfurt.de!mickeyl
oz-kernel-c7x0: enable bluetooth rfcomm and hciuart stuff. apply the inotify patch from rml and enable it in defconfig for all models
BKrev: 4264f0a682WVoxBABEKZ5VzGxjA7Ag
Diffstat (limited to 'packages/linux/linux-openzaurus-2.6.11/defconfig-c7x0')
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.11/defconfig-c7x0 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.11/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.11/defconfig-c7x0 index 0827aed09d..f6f0a54879 100644 --- a/packages/linux/linux-openzaurus-2.6.11/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.11/defconfig-c7x0 @@ -1,7 +1,6 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.11 -# Tue Apr 19 12:37:37 2005 # CONFIG_ARM=y CONFIG_MMU=y @@ -378,16 +377,17 @@ CONFIG_BT_SCO=m CONFIG_BT_RFCOMM=m CONFIG_BT_RFCOMM_TTY=y CONFIG_BT_BNEP=m -# CONFIG_BT_BNEP_MC_FILTER is not set -# CONFIG_BT_BNEP_PROTO_FILTER is not set +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=m # # Bluetooth device drivers # CONFIG_BT_HCIUART=m -# CONFIG_BT_HCIUART_H4 is not set -# CONFIG_BT_HCIUART_BCSP is not set +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_BCSP_TXCRC=y CONFIG_BT_HCIDTL1=m CONFIG_BT_HCIBT3C=m CONFIG_BT_HCIBLUECARD=m @@ -727,6 +727,7 @@ CONFIG_FS_POSIX_ACL=y # CONFIG_XFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set |