git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
cris
/
arch-v32
/
lib
/
hw_settings.S
diff --git
a/arch/cris/arch-v32/lib/hw_settings.S
b/arch/cris/arch-v32/lib/hw_settings.S
index
5182e8c
..
fff9443
100644
(file)
--- a/
arch/cris/arch-v32/lib/hw_settings.S
+++ b/
arch/cris/arch-v32/lib/hw_settings.S
@@
-10,7
+10,6
@@
* Authors: Mikael Starvik (starvik@axis.com)
*/
-#include <linux/config.h>
#include <asm/arch/hwregs/asm/reg_map_asm.h>
#include <asm/arch/hwregs/asm/bif_core_defs_asm.h>
#include <asm/arch/hwregs/asm/gio_defs_asm.h>