diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-06 18:46:28 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-06 18:46:28 -0500 |
| commit | 38407aad0d1860515223075f33843a386277a30a (patch) | |
| tree | 05659e9527ff0c76c18dd47948bae3bfb6fc3ea9 /drivers | |
| parent | 39d4e58d36321b3c3b4025d9bf28bf026c2a5bb1 (diff) | |
| parent | 454666eb78d890f5740ea1901f8b01a43c77c67c (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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ps3/ps3-lpm.c b/drivers/ps3/ps3-lpm.c index 85edf945ab86..204158cf7a55 100644 --- a/drivers/ps3/ps3-lpm.c +++ b/drivers/ps3/ps3-lpm.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 24 | #include <linux/uaccess.h> | 24 | #include <linux/uaccess.h> |
| 25 | #include <asm/smp.h> | ||
| 25 | #include <asm/time.h> | 26 | #include <asm/time.h> |
| 26 | #include <asm/ps3.h> | 27 | #include <asm/ps3.h> |
| 27 | #include <asm/lv1call.h> | 28 | #include <asm/lv1call.h> |