Enabling CONFIG_KEYS breaks afs. Signed-off-by: Andrew Morton --- 25-akpm/fs/afs/main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff -puN fs/afs/main.c~implement-in-kernel-keys-keyring-management-afs-workaround fs/afs/main.c --- 25/fs/afs/main.c~implement-in-kernel-keys-keyring-management-afs-workaround 2004-08-30 00:50:42.953234520 -0700 +++ 25-akpm/fs/afs/main.c 2004-08-30 00:50:42.957233912 -0700 @@ -100,7 +100,7 @@ static int afs_init(void) goto error; #endif -#ifdef CONFIG_KEYS +#ifdef CONFIG_KEYS_TURNED_OFF ret = afs_key_register(); if (ret < 0) goto error_cache; @@ -142,7 +142,7 @@ static int afs_init(void) error_kafstimod: afs_kafstimod_stop(); error_keys: -#ifdef CONFIG_KEYS +#ifdef CONFIG_KEYS_TURNED_OFF afs_key_unregister(); error_cache: #endif @@ -169,7 +169,7 @@ static void __exit afs_exit(void) afs_kafstimod_stop(); afs_kafsasyncd_stop(); afs_cell_purge(); -#ifdef CONFIG_KEYS +#ifdef CONFIG_KEYS_TURNED_OFF afs_key_unregister(); #endif #ifdef AFS_CACHING_SUPPORT _