diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-08 10:45:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-08 10:45:31 +0200 |
| commit | 8c285645ab3b05942124020b5f0b89d3b539823a (patch) | |
| tree | db15972689f7f0b794244294836a1233beb37dd4 /sound/pci/echoaudio/indigoio.c | |
| parent | 151798f872d6b386d82cd1707ad703e981fef8f2 (diff) | |
| parent | 844970916c8e50f630ea1a6ac82f09c42b12660a (diff) | |
| download | blackbird-op-linux-8c285645ab3b05942124020b5f0b89d3b539823a.tar.gz blackbird-op-linux-8c285645ab3b05942124020b5f0b89d3b539823a.zip | |
Merge branch 'wm8996-rename' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
Diffstat (limited to 'sound/pci/echoaudio/indigoio.c')
| -rw-r--r-- | sound/pci/echoaudio/indigoio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/echoaudio/indigoio.c b/sound/pci/echoaudio/indigoio.c index a9fcedf317a4..1af0037304c6 100644 --- a/sound/pci/echoaudio/indigoio.c +++ b/sound/pci/echoaudio/indigoio.c @@ -55,7 +55,7 @@ #include <sound/asoundef.h> #include <sound/initval.h> #include <asm/io.h> -#include <asm/atomic.h> +#include <linux/atomic.h> #include "echoaudio.h" MODULE_FIRMWARE("ea/loader_dsp.fw"); |
