diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-12 07:30:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-12 07:30:05 +0200 |
| commit | 1ba89386db0a3f39590b90b5dd20d7149ae52de0 (patch) | |
| tree | 7211f558d841cb40e1015d0b7527643ad55cb8e7 /sound/oss/vwsnd.c | |
| parent | a26929fb489188ff959b1715ee67f0c9f84405b5 (diff) | |
| parent | ae94b8075a2ed58d2318ef03827b25bc844f844e (diff) | |
| download | op-kernel-dev-1ba89386db0a3f39590b90b5dd20d7149ae52de0.zip op-kernel-dev-1ba89386db0a3f39590b90b5dd20d7149ae52de0.tar.gz | |
Merge branch 'x86/core' into x86/x2apic
Diffstat (limited to 'sound/oss/vwsnd.c')
| -rw-r--r-- | sound/oss/vwsnd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c index 2c5aaa5..dcbb3f7 100644 --- a/sound/oss/vwsnd.c +++ b/sound/oss/vwsnd.c @@ -150,7 +150,7 @@ #include <linux/interrupt.h> #include <linux/mutex.h> -#include <asm/mach-visws/cobalt.h> +#include <asm/visws/cobalt.h> #include "sound_config.h" |
