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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-ppc
/
ibm4xx.h
diff --git
a/include/asm-ppc/ibm4xx.h
b/include/asm-ppc/ibm4xx.h
index
ea883c8
..
499c146
100644
(file)
--- a/
include/asm-ppc/ibm4xx.h
+++ b/
include/asm-ppc/ibm4xx.h
@@
-14,16
+14,12
@@
#ifndef __ASM_IBM4XX_H__
#define __ASM_IBM4XX_H__
#ifndef __ASM_IBM4XX_H__
#define __ASM_IBM4XX_H__
-#include <
linux/config
.h>
+#include <
asm/types
.h>
#ifdef CONFIG_40x
#ifdef CONFIG_40x
-#if defined(CONFIG_ASH)
-#include <platforms/4xx/ash.h>
-#endif
-
-#if defined (CONFIG_CEDAR)
-#include <platforms/4xx/cedar.h>
+#if defined(CONFIG_BUBINGA)
+#include <platforms/4xx/bubinga.h>
#endif
#if defined(CONFIG_CPCI405)
#endif
#if defined(CONFIG_CPCI405)
@@
-34,29
+30,39
@@
#include <platforms/4xx/ep405.h>
#endif
#include <platforms/4xx/ep405.h>
#endif
-#if defined(CONFIG_
OAK
)
-#include <platforms/4xx/
oak
.h>
+#if defined(CONFIG_
REDWOOD_5
)
+#include <platforms/4xx/
redwood5
.h>
#endif
#endif
-#if defined(CONFIG_REDWOOD_
4
)
-#include <platforms/4xx/redwood.h>
+#if defined(CONFIG_REDWOOD_
6
)
+#include <platforms/4xx/redwood
6
.h>
#endif
#endif
-#if defined(CONFIG_
REDWOOD_5
)
-#include <platforms/4xx/
redwood5
.h>
+#if defined(CONFIG_
SYCAMORE
)
+#include <platforms/4xx/
sycamore
.h>
#endif
#if defined(CONFIG_WALNUT)
#include <platforms/4xx/walnut.h>
#endif
#endif
#if defined(CONFIG_WALNUT)
#include <platforms/4xx/walnut.h>
#endif
+#if defined(CONFIG_XILINX_ML300)
+#include <platforms/4xx/xilinx_ml300.h>
+#endif
+
+#if defined(CONFIG_XILINX_ML403)
+#include <platforms/4xx/xilinx_ml403.h>
+#endif
+
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLY__
+#ifdef CONFIG_40x
/*
* The "residual" board information structure the boot loader passes
* into the kernel.
*/
extern bd_t __res;
/*
* The "residual" board information structure the boot loader passes
* into the kernel.
*/
extern bd_t __res;
+#endif
void ppc4xx_setup_arch(void);
void ppc4xx_map_io(void);
void ppc4xx_setup_arch(void);
void ppc4xx_map_io(void);
@@
-80,23
+86,37
@@
void ppc4xx_init(unsigned long r3, unsigned long r4, unsigned long r5,
#define PCI_DRAM_OFFSET 0
#endif
#define PCI_DRAM_OFFSET 0
#endif
-#elif CONFIG_44x
+#elif defined(CONFIG_44x)
+
+#if defined(CONFIG_BAMBOO)
+#include <platforms/4xx/bamboo.h>
+#endif
#if defined(CONFIG_EBONY)
#include <platforms/4xx/ebony.h>
#endif
#if defined(CONFIG_EBONY)
#include <platforms/4xx/ebony.h>
#endif
+#if defined(CONFIG_LUAN)
+#include <platforms/4xx/luan.h>
+#endif
+
+#if defined(CONFIG_YUCCA)
+#include <platforms/4xx/yucca.h>
+#endif
+
#if defined(CONFIG_OCOTEA)
#include <platforms/4xx/ocotea.h>
#endif
#ifndef __ASSEMBLY__
#if defined(CONFIG_OCOTEA)
#include <platforms/4xx/ocotea.h>
#endif
#ifndef __ASSEMBLY__
+#ifdef CONFIG_40x
/*
* The "residual" board information structure the boot loader passes
* into the kernel.
*/
extern bd_t __res;
#endif
/*
* The "residual" board information structure the boot loader passes
* into the kernel.
*/
extern bd_t __res;
#endif
+#endif
#endif /* CONFIG_40x */
#endif /* __ASM_IBM4XX_H__ */
#endif /* CONFIG_40x */
#endif /* __ASM_IBM4XX_H__ */