git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git]
/
arch
/
mips
/
nxp
/
pnx8550
/
common
/
reset.c
diff --git
a/arch/mips/nxp/pnx8550/common/reset.c
b/arch/mips/nxp/pnx8550/common/reset.c
index
7b2cbc5
..
fadd874
100644
(file)
--- a/
arch/mips/nxp/pnx8550/common/reset.c
+++ b/
arch/mips/nxp/pnx8550/common/reset.c
@@
-20,7
+20,8
@@
* Reset the PNX8550 board.
*
*/
-#include <linux/slab.h>
+#include <linux/kernel.h>
+
#include <asm/reboot.h>
#include <glb.h>