Merge branch 'master'

[mv-sheeva.git] / include / asm-xtensa / page.h

diff --git a/include/asm-xtensa/page.h b/include/asm-xtensa/page.h
index b495e5b5a9427bddae499243a634d6583711b9ae..8ded36f255a2847a12f629e38db3c3ab2dab0921 100644 (file)
--- a/include/asm-xtensa/page.h
+++ b/include/asm-xtensa/page.h
@@ -55,7 +55,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
  * Pure 2^n version of get_order
  */
 
-extern __inline__ int get_order(unsigned long size)
+static inline int get_order(unsigned long size)
 {
        int order;
 #ifndef XCHAL_HAVE_NSU