summaryrefslogtreecommitdiffstats
path: root/sound/pci/trident/trident_main.c
diff options
context:
space:
mode:
authorDave Kleikamp <shaggy@austin.ibm.com>2005-07-28 16:03:36 +0200
committerDave Kleikamp <shaggy@austin.ibm.com>2005-07-28 16:03:36 +0200
commitda28c12089dfcfb8695b6b555cdb8e03dda2b690 (patch)
treeb3ff509f21352ef053cb3d490cb13528090d32ac /sound/pci/trident/trident_main.c
parentMerge with /home/shaggy/git/linus-clean/ (diff)
parent[PATCH] More qla2xxx configuration fixes (diff)
downloadlinux-da28c12089dfcfb8695b6b555cdb8e03dda2b690.tar.xz
linux-da28c12089dfcfb8695b6b555cdb8e03dda2b690.zip
Merge with /home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/ /home/shaggy/git/linus-clean/ Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'sound/pci/trident/trident_main.c')
-rw-r--r--sound/pci/trident/trident_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index ccd5ca2ba16f..a09b0fb49e81 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -3204,7 +3204,7 @@ static inline void snd_trident_free_gameport(trident_t *chip) { }
/*
* delay for 1 tick
*/
-inline static void do_delay(trident_t *chip)
+static inline void do_delay(trident_t *chip)
{
set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout(1);