diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 20:17:05 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 20:17:05 +0100 |
| commit | 70c07e02625ec46d0ffbfce1acef42d660803528 (patch) | |
| tree | f500f1a4f93e72747fb08b0eefabb167dcdc5db9 /sound/oss/emu10k1/recmgr.c | |
| parent | Merge branch 'master' (diff) | |
| parent | Merge branch 'net.b0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird (diff) | |
| download | linux-70c07e02625ec46d0ffbfce1acef42d660803528.tar.xz linux-70c07e02625ec46d0ffbfce1acef42d660803528.zip | |
Merge branch 'viro'
Diffstat (limited to 'sound/oss/emu10k1/recmgr.c')
| -rw-r--r-- | sound/oss/emu10k1/recmgr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/emu10k1/recmgr.c b/sound/oss/emu10k1/recmgr.c index 67c3fd04cfdd..2ce56180e7d4 100644 --- a/sound/oss/emu10k1/recmgr.c +++ b/sound/oss/emu10k1/recmgr.c @@ -29,7 +29,7 @@ ********************************************************************** */ -#include <asm/delay.h> +#include <linux/delay.h> #include "8010.h" #include "recmgr.h" |