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
/
amigaone
/
setup.c
diff --git
a/arch/powerpc/platforms/amigaone/setup.c
b/arch/powerpc/platforms/amigaone/setup.c
index 9290a7a442d0af9d2736a81e4431ffd367df92b0..fb4eb0df054c0a701fe74df78990d40bd480e2df 100644
(file)
--- a/
arch/powerpc/platforms/amigaone/setup.c
+++ b/
arch/powerpc/platforms/amigaone/setup.c
@@
-14,7
+14,7
@@
#include <linux/kernel.h>
#include <linux/seq_file.h>
-#include <
linux
/utsrelease.h>
+#include <
generated
/utsrelease.h>
#include <asm/machdep.h>
#include <asm/cputable.h>