From: Andrew Morton <akpm@linux-foundation.org>

- don't use __inline__

- coding-style repairs

Cc: Antonino Daplas <adaplas@gmail.com>
Cc: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/video/tdfxfb.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/video/tdfxfb.c~tdfxfb-mtrr-support-fix drivers/video/tdfxfb.c
--- a/drivers/video/tdfxfb.c~tdfxfb-mtrr-support-fix
+++ a/drivers/video/tdfxfb.c
@@ -83,12 +83,12 @@
 /* duplicate asm/mtrr.h defines to work on archs without mtrr */
 #define MTRR_TYPE_WRCOMB     1
 
-static __inline__ int mtrr_add (unsigned long base, unsigned long size,
+static inline int mtrr_add(unsigned long base, unsigned long size,
 				unsigned int type, char increment)
 {
     return -ENODEV;
 }
-static __inline__ int mtrr_del (int reg, unsigned long base,
+static inline int mtrr_del(int reg, unsigned long base,
 				unsigned long size)
 {
     return -ENODEV;
_