Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[mv-sheeva.git] / include / asm-s390 / ebcdic.h

diff --git a/include/asm-s390/ebcdic.h b/include/asm-s390/ebcdic.h
index 20e81e8858214562ce12c7f8aa418194afdcc24f..4cbc336e4d60ad95a5aa956ccd385e16b702a7e2 100644 (file)
--- a/include/asm-s390/ebcdic.h
+++ b/include/asm-s390/ebcdic.h
@@ -21,7 +21,7 @@ extern __u8 _ebcasc[];   /* EBCDIC -> ASCII conversion table */
 extern __u8 _ebc_tolower[]; /* EBCDIC -> lowercase */
 extern __u8 _ebc_toupper[]; /* EBCDIC -> uppercase */
 
-extern __inline__ void
+static inline void
 codepage_convert(const __u8 *codepage, volatile __u8 * addr, unsigned long nr)
 {
        if (nr-- <= 0)