[ARM] Merge most of the PXA work for initial merge

[linux-2.6] / include / asm-sparc / msi.h

diff --git a/include/asm-sparc/msi.h b/include/asm-sparc/msi.h
index b69543dd3b46069127b44d5b3d5d5b3ca1b4eb4f..724ca566705240aace5e819e4700ad6b6b525fad 100644 (file)
--- a/include/asm-sparc/msi.h
+++ b/include/asm-sparc/msi.h
@@ -1,4 +1,4 @@
-/* $Id: msi.h,v 1.3 1996/08/29 09:48:25 davem Exp $
+/*
  * msi.h:  Defines specific to the MBus - Sbus - Interface.
  *
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
@@ -19,7 +19,7 @@
 #define MSI_ASYNC_MODE  0x80000000     /* Operate the MSI asynchronously */
 
 
-extern __inline__ void msi_set_sync(void)
+static inline void msi_set_sync(void)
 {
        __asm__ __volatile__ ("lda [%0] %1, %%g3\n\t"
                              "andn %%g3, %2, %%g3\n\t"