Merge commit 'v3.1-rc1' into imx-fixes

[karo-tx-linux.git] / sound / sparc / dbri.c

diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index 73f9cbacc0775bbc9cb1cf8f36f187e5606e8486..1b839a0f3653a48fabdd09de110c6be346d79b4f 100644 (file)
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -69,7 +69,7 @@
 
 #include <linux/of.h>
 #include <linux/of_device.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 MODULE_AUTHOR("Rudolf Koenig, Brent Baccala and Martin Habets");
 MODULE_DESCRIPTION("Sun DBRI");