Merge /scratch/Ksrc/linux-git/

[linux-2.6] / sound / isa / sb / emu8000_patch.c

diff --git a/sound/isa/sb/emu8000_patch.c b/sound/isa/sb/emu8000_patch.c
index 4afc4a1bc140e97cd4ca4fcf85c28dd5b56dcda8..26e693078cb3a1231e56874f5f9bcb7960884984 100644 (file)
--- a/sound/isa/sb/emu8000_patch.c
+++ b/sound/isa/sb/emu8000_patch.c
@@ -128,7 +128,7 @@ snd_emu8000_write_wait(emu8000_t *emu)
  * This is therefore much slower than need be, but is at least
  * working.
  */
-inline static void
+static inline void
 write_word(emu8000_t *emu, int *offset, unsigned short data)
 {
        if (emu8000_reset_addr) {