Update of /cvsroot/gc-linux/linux/include/asm-ppc
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13650/include/asm-ppc
Modified Files:
ppcboot.h
Log Message:
Merged 2.6.25.
Queued small fixes for:
- starlet-es
- starlet-ipc
- starlet-stm
- rvl-stsd
- rvl-sthcd
- gcn-ai
Index: ppcboot.h
===================================================================
RCS file: /cvsroot/gc-linux/linux/include/asm-ppc/ppcboot.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ppcboot.h 18 Jan 2006 23:41:53 -0000 1.5
+++ ppcboot.h 13 Sep 2008 19:42:57 -0000 1.6
@@ -38,8 +38,7 @@
unsigned long bi_flashoffset; /* reserved area for startup monitor */
unsigned long bi_sramstart; /* start of SRAM memory */
unsigned long bi_sramsize; /* size of SRAM memory */
-#if defined(CONFIG_8xx) || defined(CONFIG_CPM2) || defined(CONFIG_85xx) ||\
- defined(CONFIG_83xx)
+#if defined(CONFIG_8xx) || defined(CONFIG_CPM2)
unsigned long bi_immr_base; /* base of IMMR register */
#endif
#if defined(CONFIG_PPC_MPC52xx)
@@ -76,12 +75,11 @@
#if defined(CONFIG_HYMOD)
hymod_conf_t bi_hymod_conf; /* hymod configuration information */
#endif
-#if defined(CONFIG_EVB64260) || defined(CONFIG_405EP) || defined(CONFIG_44x) || \
- defined(CONFIG_85xx) || defined(CONFIG_83xx)
+#if defined(CONFIG_EVB64260) || defined(CONFIG_405EP) || defined(CONFIG_44x)
/* second onboard ethernet port */
unsigned char bi_enet1addr[6];
#endif
-#if defined(CONFIG_EVB64260) || defined(CONFIG_440GX) || defined(CONFIG_85xx)
+#if defined(CONFIG_EVB64260) || defined(CONFIG_440GX)
/* third onboard ethernet ports */
unsigned char bi_enet2addr[6];
#endif
|
