Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6-omap-h63xx.git] / drivers / s390 / s390mach.h

diff --git a/drivers/s390/s390mach.h b/drivers/s390/s390mach.h
index 4eaa70179182a62e9b28ef8d4a356f3b3e09096b..d9ea7ed2e46e9ceead16eab686ebdff3086ee8fe 100644 (file)
--- a/drivers/s390/s390mach.h
+++ b/drivers/s390/s390mach.h
@@ -88,7 +88,7 @@ struct crw {
 #define CRW_ERC_PERRI    0x07 /* perm. error, facility init */
 #define CRW_ERC_PMOD     0x08 /* installed parameters modified */
 
-extern __inline__ int stcrw(struct crw *pcrw )
+static inline int stcrw(struct crw *pcrw )
 {
         int ccode;