Merge branch 'for-35' of git://repo.or.cz/linux-kbuild

[safe/jmp/linux-2.6] / arch / sh / include / asm / cache.h

diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
index 455a9a9..ef9e555 100644 (file)
--- a/arch/sh/include/asm/cache.h
+++ b/arch/sh/include/asm/cache.h
@@ -38,14 +38,10 @@ struct cache_info {
         * 2. those in the physical page number.
         */
        unsigned int alias_mask;
         * 2. those in the physical page number.
         */
        unsigned int alias_mask;

-

        unsigned int n_aliases;         /* Number of aliases */
 
        unsigned long flags;
 };
        unsigned int n_aliases;         /* Number of aliases */
 
        unsigned long flags;
 };

-
-int __init detect_cpu_and_cache_system(void);
-

 #endif /* __ASSEMBLY__ */
 #endif /* __KERNEL__ */
 #endif /* __ASM_SH_CACHE_H */
 #endif /* __ASSEMBLY__ */
 #endif /* __KERNEL__ */
 #endif /* __ASM_SH_CACHE_H */