Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[~andy/linux] / arch / s390 / mm / extmem.c

diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c
index 8bffadb5e537b7e9e3cdd3208db26d37b6830dd0..394980b05e6fd91aaea02bacca57f81062690ad4 100644 (file)
--- a/arch/s390/mm/extmem.c
+++ b/arch/s390/mm/extmem.c
@@ -91,7 +91,7 @@ static char *segtype_string[] = { "SW", "EW", "SR", "ER", "SN", "EN", "SC",
  * Create the 8 bytes, ebcdic VM segment name from
  * an ascii name.
  */
-static void inline
+static void
 dcss_mkname(char *name, char *dcss_name)
 {
        int i;