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-poodle | |
| 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-poodle')
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.11/defconfig-poodle | 1 |
1 files changed, 1 insertions, 0 deletions
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 |