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 tag 'arc-v3.10-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
um
/
sys-ppc
/
misc.S
diff --git
a/arch/um/sys-ppc/misc.S
b/arch/um/sys-ppc/misc.S
index f0c971db47e42b94dc4b7d43fecc751c65fedaeb..1364b7da578c000f937a3253c2265a9dbf6494f5 100644
(file)
--- a/
arch/um/sys-ppc/misc.S
+++ b/
arch/um/sys-ppc/misc.S
@@
-15,7
+15,6
@@
*
*/
-#include <linux/config.h>
#include <asm/processor.h>
#include "ppc_asm.h"