diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 23:14:43 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 23:14:43 +0400 |
commit | 414f746d232d41ed6ae8632c4495ae795373c44b (patch) | |
tree | 167f9bc8f139c6e82e6732b38c7a938b8a9d31cd /arch/blackfin/configs/SRV1_defconfig | |
parent | 5a7a201c51c324876d00a54e7208af6af12d1ca4 (diff) | |
parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
download | linux-414f746d232d41ed6ae8632c4495ae795373c44b.tar.xz |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'arch/blackfin/configs/SRV1_defconfig')
-rw-r--r-- | arch/blackfin/configs/SRV1_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/configs/SRV1_defconfig b/arch/blackfin/configs/SRV1_defconfig index 951ea0412576..b1309f878fcd 100644 --- a/arch/blackfin/configs/SRV1_defconfig +++ b/arch/blackfin/configs/SRV1_defconfig @@ -1067,7 +1067,7 @@ CONFIG_FS_MBCACHE=y CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set -CONFIG_DNOTIFY=y +# CONFIG_DNOTIFY is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set # CONFIG_FUSE_FS is not set |