aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-06 15:46:28 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-06 15:46:28 -0800
commit38407aad0d1860515223075f33843a386277a30a (patch)
tree05659e9527ff0c76c18dd47948bae3bfb6fc3ea9 /drivers
parent39d4e58d36321b3c3b4025d9bf28bf026c2a5bb1 (diff)
parent454666eb78d890f5740ea1901f8b01a43c77c67c (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: powerpc: Fix "unused variable" warning in pci_dlpar.c powerpc/cell: Fix compile error in ras.c powerpc/ps3: Fix compile error in ps3-lpm.c
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ps3/ps3-lpm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ps3/ps3-lpm.c b/drivers/ps3/ps3-lpm.c
index 85edf945ab8..204158cf7a5 100644
--- a/drivers/ps3/ps3-lpm.c
+++ b/drivers/ps3/ps3-lpm.c
@@ -22,6 +22,7 @@
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/uaccess.h>
+#include <asm/smp.h>
#include <asm/time.h>
#include <asm/ps3.h>
#include <asm/lv1call.h>