From 0c7bd9ba4da5dbf31c5b2b704c135dcb385a6bd3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 19 Apr 2005 11:51:02 +0000 Subject: 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 --- packages/linux/linux-openzaurus-2.6.11/defconfig-poodle | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/linux/linux-openzaurus-2.6.11/defconfig-poodle') diff --git a/packages/linux/linux-openzaurus-2.6.11/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.11/defconfig-poodle index 42a851dd5f..9fa05217a8 100644 --- a/packages/linux/linux-openzaurus-2.6.11/defconfig-poodle +++ b/packages/linux/linux-openzaurus-2.6.11/defconfig-poodle @@ -662,6 +662,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 -- cgit v1.2.3