Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

[~andy/linux] / drivers / tty / rocket.c

diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
index 13043e8d37fe8ffc4ffc6bb681c8f56009ebbe4b..6a1241c7f841762dceb4d564305ffffe1bddc69a 100644 (file)
--- a/drivers/tty/rocket.c
+++ b/drivers/tty/rocket.c
@@ -83,7 +83,7 @@
 #include <linux/wait.h>
 #include <linux/pci.h>
 #include <linux/uaccess.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/unaligned.h>
 #include <linux/bitops.h>
 #include <linux/spinlock.h>