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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-arm
/
arch-ixp4xx
/
hardware.h
diff --git
a/include/asm-arm/arch-ixp4xx/hardware.h
b/include/asm-arm/arch-ixp4xx/hardware.h
index
4ac964b
..
6acb69c
100644
(file)
--- a/
include/asm-arm/arch-ixp4xx/hardware.h
+++ b/
include/asm-arm/arch-ixp4xx/hardware.h
@@
-27,7
+27,7
@@
#define pcibios_assign_all_busses() 1
#define pcibios_assign_all_busses() 1
-#if defined(CONFIG_CPU_IXP46
5
) && !defined(__ASSEMBLY__)
+#if defined(CONFIG_CPU_IXP46
X
) && !defined(__ASSEMBLY__)
extern unsigned int processor_id;
#define cpu_is_ixp465() ((processor_id & 0xffffffc0) == 0x69054200)
#else
extern unsigned int processor_id;
#define cpu_is_ixp465() ((processor_id & 0xffffffc0) == 0x69054200)
#else
@@
-44,5
+44,7
@@
extern unsigned int processor_id;
#include "ixdp425.h"
#include "coyote.h"
#include "prpmc1100.h"
#include "ixdp425.h"
#include "coyote.h"
#include "prpmc1100.h"
+#include "nslu2.h"
+#include "nas100d.h"
#endif /* _ASM_ARCH_HARDWARE_H */
#endif /* _ASM_ARCH_HARDWARE_H */