diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-08 14:30:29 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-08 14:30:29 +0200 |
| commit | 0a2d31b62dba9b5b92a38c67c9cc42630513662a (patch) | |
| tree | f755d74ec85248de645e10c45ed1a2ed467530f6 /sound/pci/echoaudio/indigodj.c | |
| parent | 8039290a91c5dc4414093c086987a5d7738fe2fd (diff) | |
| parent | df944f66784e6d4f2f50739263a4947885d8b6ae (diff) | |
| download | blackbird-op-linux-0a2d31b62dba9b5b92a38c67c9cc42630513662a.tar.gz blackbird-op-linux-0a2d31b62dba9b5b92a38c67c9cc42630513662a.zip | |
Merge branch 'fix/kconfig' into for-linus
Diffstat (limited to 'sound/pci/echoaudio/indigodj.c')
| -rw-r--r-- | sound/pci/echoaudio/indigodj.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/echoaudio/indigodj.c b/sound/pci/echoaudio/indigodj.c index 3550715bab1c..e594a3b2766e 100644 --- a/sound/pci/echoaudio/indigodj.c +++ b/sound/pci/echoaudio/indigodj.c @@ -54,7 +54,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"); |
