git.samba.org
/
sfrench
/
cifs-2.6.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.org/pub/scm/linux/kernel/git/jmorris...
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
platforms
/
chrp
/
setup.c
diff --git
a/arch/powerpc/platforms/chrp/setup.c
b/arch/powerpc/platforms/chrp/setup.c
index 52f3df3b4ca0a6a196e1712e6038a303661b7aed..8f41685d8f42b5669ee2a7e2492b5755e6919986 100644
(file)
--- a/
arch/powerpc/platforms/chrp/setup.c
+++ b/
arch/powerpc/platforms/chrp/setup.c
@@
-23,7
+23,7
@@
#include <linux/reboot.h>
#include <linux/init.h>
#include <linux/pci.h>
-#include <
linux
/utsrelease.h>
+#include <
generated
/utsrelease.h>
#include <linux/adb.h>
#include <linux/module.h>
#include <linux/delay.h>