From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 4 Jan 2006 19:20:43 +0000 (+0000)
Subject: allow nvram access to kernel modules on brcm-2.6
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=da423c9f7d21569d3b2d68f353b772eb3e800c9e

allow nvram access to kernel modules on brcm-2.6

SVN-Revision: 2820
---

diff --git a/openwrt/target/linux/linux-2.6/patches/brcm/001-bcm947xx.patch b/openwrt/target/linux/linux-2.6/patches/brcm/001-bcm947xx.patch
index b945e43721..739590b1cf 100644
--- a/openwrt/target/linux/linux-2.6/patches/brcm/001-bcm947xx.patch
+++ b/openwrt/target/linux/linux-2.6/patches/brcm/001-bcm947xx.patch
@@ -1,6 +1,6 @@
 diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
---- linux.old/arch/mips/Kconfig	2005-12-15 13:26:49.758027500 +0100
-+++ linux.dev/arch/mips/Kconfig	2005-12-15 12:57:27.889182500 +0100
+--- linux.old/arch/mips/Kconfig	2005-12-19 01:36:54.000000000 +0100
++++ linux.dev/arch/mips/Kconfig	2005-12-28 16:37:32.810257250 +0100
 @@ -244,6 +244,17 @@
  	 Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
  	 Olivetti M700-10 workstations.
@@ -20,8 +20,8 @@ diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
  	bool "Support for LASAT Networks platforms"
  	select DMA_NONCOHERENT
 diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
---- linux.old/arch/mips/Makefile	2005-12-15 13:26:49.766024000 +0100
-+++ linux.dev/arch/mips/Makefile	2005-12-15 12:57:27.921168500 +0100
+--- linux.old/arch/mips/Makefile	2005-12-19 01:36:54.000000000 +0100
++++ linux.dev/arch/mips/Makefile	2005-12-28 16:37:32.814257500 +0100
 @@ -689,6 +689,13 @@
  load-$(CONFIG_SIBYTE_BIGSUR)	:= 0xffffffff80100000
  
@@ -38,7 +38,7 @@ diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
  core-$(CONFIG_SNI_RM200_PCI)	+= arch/mips/sni/
 diff -urN linux.old/arch/mips/bcm947xx/Makefile linux.dev/arch/mips/bcm947xx/Makefile
 --- linux.old/arch/mips/bcm947xx/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/Makefile	2005-12-15 14:32:03.580639500 +0100
++++ linux.dev/arch/mips/bcm947xx/Makefile	2005-12-28 16:37:32.814257500 +0100
 @@ -0,0 +1,6 @@
 +#
 +# Makefile for the BCM47xx specific kernel interface routines
@@ -48,7 +48,7 @@ diff -urN linux.old/arch/mips/bcm947xx/Makefile linux.dev/arch/mips/bcm947xx/Mak
 +obj-y := irq.o int-handler.o prom.o setup.o time.o pci.o
 diff -urN linux.old/arch/mips/bcm947xx/broadcom/Makefile linux.dev/arch/mips/bcm947xx/broadcom/Makefile
 --- linux.old/arch/mips/bcm947xx/broadcom/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/broadcom/Makefile	2005-12-17 20:51:17.749271000 +0100
++++ linux.dev/arch/mips/bcm947xx/broadcom/Makefile	2005-12-28 16:37:32.814257500 +0100
 @@ -0,0 +1,6 @@
 +#
 +# Makefile for the BCM47xx specific kernel interface routines
@@ -58,7 +58,7 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/Makefile linux.dev/arch/mips/bcm
 +obj-y	:= sbutils.o linux_osl.o bcmsrom.o bcmutils.o sbmips.o sbpci.o sflash.o nvram.o cfe_env.o
 diff -urN linux.old/arch/mips/bcm947xx/broadcom/bcmsrom.c linux.dev/arch/mips/bcm947xx/broadcom/bcmsrom.c
 --- linux.old/arch/mips/bcm947xx/broadcom/bcmsrom.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/broadcom/bcmsrom.c	2005-12-17 01:21:23.007883000 +0100
++++ linux.dev/arch/mips/bcm947xx/broadcom/bcmsrom.c	2005-12-28 16:37:32.814257500 +0100
 @@ -0,0 +1,481 @@
 +/*
 + *  Misc useful routines to access NIC SROM/OTP .
@@ -543,7 +543,7 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/bcmsrom.c linux.dev/arch/mips/bc
 +
 diff -urN linux.old/arch/mips/bcm947xx/broadcom/bcmutils.c linux.dev/arch/mips/bcm947xx/broadcom/bcmutils.c
 --- linux.old/arch/mips/bcm947xx/broadcom/bcmutils.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/broadcom/bcmutils.c	2005-12-17 17:53:52.387365000 +0100
++++ linux.dev/arch/mips/bcm947xx/broadcom/bcmutils.c	2005-12-28 16:37:32.814257500 +0100
 @@ -0,0 +1,356 @@
 +/*
 + * Misc useful OS-independent routines.
@@ -903,7 +903,7 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/bcmutils.c linux.dev/arch/mips/b
 +#endif
 diff -urN linux.old/arch/mips/bcm947xx/broadcom/cfe_env.c linux.dev/arch/mips/bcm947xx/broadcom/cfe_env.c
 --- linux.old/arch/mips/bcm947xx/broadcom/cfe_env.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/broadcom/cfe_env.c	2005-12-17 21:40:08.166726750 +0100
++++ linux.dev/arch/mips/bcm947xx/broadcom/cfe_env.c	2005-12-28 16:37:32.818257750 +0100
 @@ -0,0 +1,234 @@
 +/*
 + * NVRAM variable manipulation (Linux kernel half)
@@ -1141,7 +1141,7 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/cfe_env.c linux.dev/arch/mips/bc
 +
 diff -urN linux.old/arch/mips/bcm947xx/broadcom/linux_osl.c linux.dev/arch/mips/bcm947xx/broadcom/linux_osl.c
 --- linux.old/arch/mips/bcm947xx/broadcom/linux_osl.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/broadcom/linux_osl.c	2005-12-15 17:11:05.818041750 +0100
++++ linux.dev/arch/mips/bcm947xx/broadcom/linux_osl.c	2005-12-28 16:37:32.834258750 +0100
 @@ -0,0 +1,102 @@
 +/*
 + * Linux OS Independent Layer
@@ -1247,8 +1247,8 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/linux_osl.c linux.dev/arch/mips/
 +
 diff -urN linux.old/arch/mips/bcm947xx/broadcom/nvram.c linux.dev/arch/mips/bcm947xx/broadcom/nvram.c
 --- linux.old/arch/mips/bcm947xx/broadcom/nvram.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/broadcom/nvram.c	2005-12-18 04:59:36.185204500 +0100
-@@ -0,0 +1,165 @@
++++ linux.dev/arch/mips/bcm947xx/broadcom/nvram.c	2005-12-28 19:30:54.804469750 +0100
+@@ -0,0 +1,192 @@
 +/*
 + * NVRAM variable manipulation (Linux kernel half)
 + *
@@ -1383,7 +1383,7 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/nvram.c linux.dev/arch/mips/bcm9
 +}
 +
 +/* Early (before mm or mtd) read-only access to NVRAM */
-+char * __init nvram_get(const char *name)
++char * __init early_nvram_get(const char *name)
 +{
 +	char *var, *value, *end, *eq;
 +
@@ -1414,9 +1414,36 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/nvram.c linux.dev/arch/mips/bcm9
 +
 +	return NULL;
 +}
++
++char *nvram_get(const char *name)
++{
++	char *var, *value, *end, *eq;
++
++	if (!name)
++		return NULL;
++
++	if (!nvram_buf[0])
++		return NULL;
++	
++	/* Look for name=value and return value */
++	var = &nvram_buf[sizeof(struct nvram_header)];
++	end = nvram_buf + sizeof(nvram_buf) - 2;
++	end[0] = end[1] = '\0';
++	for (; *var; var = value + strlen(value) + 1) {
++		if (!(eq = strchr(var, '=')))
++			break;
++		value = eq + 1;
++		if ((eq - var) == strlen(name) && strncmp(var, name, (eq - var)) == 0)
++			return value;
++	}
++	
++	return NULL;
++}
++
++EXPORT_SYMBOL(nvram_get);
 diff -urN linux.old/arch/mips/bcm947xx/broadcom/sbmips.c linux.dev/arch/mips/bcm947xx/broadcom/sbmips.c
 --- linux.old/arch/mips/bcm947xx/broadcom/sbmips.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/broadcom/sbmips.c	2005-12-15 16:46:31.122961250 +0100
++++ linux.dev/arch/mips/bcm947xx/broadcom/sbmips.c	2005-12-28 19:19:50.570957750 +0100
 @@ -0,0 +1,1038 @@
 +/*
 + * BCM47XX Sonics SiliconBackplane MIPS core routines
@@ -1836,7 +1863,7 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/sbmips.c linux.dev/arch/mips/bcm
 +		BCMINIT(sb_setirq)(sbh, 3, SB_ILINE20, 0);
 +		BCMINIT(sb_setirq)(sbh, 4, SB_PCI, 0);
 +		ASSERT(eir);
-+		value = BCMINIT(nvram_get)("et0phyaddr");
++		value = BCMINIT(early_nvram_get)("et0phyaddr");
 +		if (value && !strcmp(value, "31")) {
 +			/* Enable internal UART */
 +			W_REG(&eir->corecontrol, CC_UE);
@@ -2458,7 +2485,7 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/sbmips.c linux.dev/arch/mips/bcm
 +
 diff -urN linux.old/arch/mips/bcm947xx/broadcom/sbpci.c linux.dev/arch/mips/bcm947xx/broadcom/sbpci.c
 --- linux.old/arch/mips/bcm947xx/broadcom/sbpci.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/broadcom/sbpci.c	2005-12-18 05:36:53.351735500 +0100
++++ linux.dev/arch/mips/bcm947xx/broadcom/sbpci.c	2005-12-28 16:37:32.854260000 +0100
 @@ -0,0 +1,533 @@
 +/*
 + * Low-Level PCI and SB support for BCM47xx
@@ -2995,7 +3022,7 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/sbpci.c linux.dev/arch/mips/bcm9
 +
 diff -urN linux.old/arch/mips/bcm947xx/broadcom/sbutils.c linux.dev/arch/mips/bcm947xx/broadcom/sbutils.c
 --- linux.old/arch/mips/bcm947xx/broadcom/sbutils.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/broadcom/sbutils.c	2005-12-17 01:21:12.951254500 +0100
++++ linux.dev/arch/mips/bcm947xx/broadcom/sbutils.c	2005-12-28 16:37:32.858260250 +0100
 @@ -0,0 +1,2370 @@
 +/*
 + * Misc utility routines for accessing chip-specific features
@@ -5369,7 +5396,7 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/sbutils.c linux.dev/arch/mips/bc
 +EXPORT_SYMBOL(sb_watchdog);
 diff -urN linux.old/arch/mips/bcm947xx/broadcom/sflash.c linux.dev/arch/mips/bcm947xx/broadcom/sflash.c
 --- linux.old/arch/mips/bcm947xx/broadcom/sflash.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/broadcom/sflash.c	2005-12-15 16:59:20.045933750 +0100
++++ linux.dev/arch/mips/bcm947xx/broadcom/sflash.c	2005-12-28 16:37:32.870261000 +0100
 @@ -0,0 +1,418 @@
 +/*
 + * Broadcom SiliconBackplane chipcommon serial flash interface
@@ -5791,7 +5818,7 @@ diff -urN linux.old/arch/mips/bcm947xx/broadcom/sflash.c linux.dev/arch/mips/bcm
 +
 diff -urN linux.old/arch/mips/bcm947xx/include/bcmdevs.h linux.dev/arch/mips/bcm947xx/include/bcmdevs.h
 --- linux.old/arch/mips/bcm947xx/include/bcmdevs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/bcmdevs.h	2005-12-15 15:25:24.905340500 +0100
++++ linux.dev/arch/mips/bcm947xx/include/bcmdevs.h	2005-12-28 16:37:32.874261250 +0100
 @@ -0,0 +1,391 @@
 +/*
 + * Broadcom device-specific manifest constants.
@@ -6186,7 +6213,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/bcmdevs.h linux.dev/arch/mips/bcm
 +#endif /* _BCMDEVS_H */
 diff -urN linux.old/arch/mips/bcm947xx/include/bcmendian.h linux.dev/arch/mips/bcm947xx/include/bcmendian.h
 --- linux.old/arch/mips/bcm947xx/include/bcmendian.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/bcmendian.h	2005-12-15 15:25:47.146730500 +0100
++++ linux.dev/arch/mips/bcm947xx/include/bcmendian.h	2005-12-28 16:37:32.874261250 +0100
 @@ -0,0 +1,152 @@
 +/*
 + * local version of endian.h - byte order defines
@@ -6342,8 +6369,8 @@ diff -urN linux.old/arch/mips/bcm947xx/include/bcmendian.h linux.dev/arch/mips/b
 +#endif /* _BCMENDIAN_H_ */
 diff -urN linux.old/arch/mips/bcm947xx/include/bcmnvram.h linux.dev/arch/mips/bcm947xx/include/bcmnvram.h
 --- linux.old/arch/mips/bcm947xx/include/bcmnvram.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/bcmnvram.h	2005-12-15 16:04:35.850827500 +0100
-@@ -0,0 +1,87 @@
++++ linux.dev/arch/mips/bcm947xx/include/bcmnvram.h	2005-12-28 19:28:28.399320000 +0100
+@@ -0,0 +1,95 @@
 +/*
 + * NVRAM variable manipulation
 + *
@@ -6385,14 +6412,22 @@ diff -urN linux.old/arch/mips/bcm947xx/include/bcmnvram.h linux.dev/arch/mips/bc
 + * @param	name	name of variable to get
 + * @return	value of variable or NULL if undefined
 + */
-+extern char * __init nvram_get(const char *name);
++extern char * __init early_nvram_get(const char *name);
++
++/*
++ * Get the value of an NVRAM variable. The pointer returned may be
++ * invalid after a set.
++ * @param	name	name of variable to get
++ * @return	value of variable or NULL if undefined
++ */
++extern char *nvram_get(const char *name);
 +
 +/* 
 + * Get the value of an NVRAM variable.
 + * @param	name	name of variable to get
 + * @return	value of variable or NUL if undefined
 + */
-+#define nvram_safe_get(name) (BCMINIT(nvram_get)(name) ? : "")
++#define nvram_safe_get(name) (BCMINIT(early_nvram_get)(name) ? : "")
 +
 +/*
 + * Match an NVRAM variable.
@@ -6403,7 +6438,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/bcmnvram.h linux.dev/arch/mips/bc
 + */
 +static inline int
 +nvram_match(char *name, char *match) {
-+	const char *value = BCMINIT(nvram_get)(name);
++	const char *value = BCMINIT(early_nvram_get)(name);
 +	return (value && !strcmp(value, match));
 +}
 +
@@ -6416,7 +6451,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/bcmnvram.h linux.dev/arch/mips/bc
 + */
 +static inline int
 +nvram_invmatch(char *name, char *invmatch) {
-+	const char *value = BCMINIT(nvram_get)(name);
++	const char *value = BCMINIT(early_nvram_get)(name);
 +	return (value && strcmp(value, invmatch));
 +}
 +
@@ -6433,7 +6468,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/bcmnvram.h linux.dev/arch/mips/bc
 +#endif /* _bcmnvram_h_ */
 diff -urN linux.old/arch/mips/bcm947xx/include/bcmsrom.h linux.dev/arch/mips/bcm947xx/include/bcmsrom.h
 --- linux.old/arch/mips/bcm947xx/include/bcmsrom.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/bcmsrom.h	2005-12-15 15:34:32.919589250 +0100
++++ linux.dev/arch/mips/bcm947xx/include/bcmsrom.h	2005-12-28 16:37:32.874261250 +0100
 @@ -0,0 +1,23 @@
 +/*
 + * Misc useful routines to access NIC local SROM/OTP .
@@ -6460,7 +6495,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/bcmsrom.h linux.dev/arch/mips/bcm
 +#endif	/* _bcmsrom_h_ */
 diff -urN linux.old/arch/mips/bcm947xx/include/bcmutils.h linux.dev/arch/mips/bcm947xx/include/bcmutils.h
 --- linux.old/arch/mips/bcm947xx/include/bcmutils.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/bcmutils.h	2005-12-15 16:44:25.619117750 +0100
++++ linux.dev/arch/mips/bcm947xx/include/bcmutils.h	2005-12-28 16:37:32.874261250 +0100
 @@ -0,0 +1,308 @@
 +/*
 + * Misc useful os-independent macros and functions.
@@ -6772,7 +6807,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/bcmutils.h linux.dev/arch/mips/bc
 +#endif	/* _bcmutils_h_ */
 diff -urN linux.old/arch/mips/bcm947xx/include/bitfuncs.h linux.dev/arch/mips/bcm947xx/include/bitfuncs.h
 --- linux.old/arch/mips/bcm947xx/include/bitfuncs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/bitfuncs.h	2005-12-15 15:34:40.268048500 +0100
++++ linux.dev/arch/mips/bcm947xx/include/bitfuncs.h	2005-12-28 16:37:32.874261250 +0100
 @@ -0,0 +1,85 @@
 +/*
 + * bit manipulation utility functions
@@ -6861,7 +6896,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/bitfuncs.h linux.dev/arch/mips/bc
 +#endif /* _BITFUNCS_H */
 diff -urN linux.old/arch/mips/bcm947xx/include/flash.h linux.dev/arch/mips/bcm947xx/include/flash.h
 --- linux.old/arch/mips/bcm947xx/include/flash.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/flash.h	2005-12-15 15:34:44.280299250 +0100
++++ linux.dev/arch/mips/bcm947xx/include/flash.h	2005-12-28 16:37:32.874261250 +0100
 @@ -0,0 +1,188 @@
 +/*
 + * flash.h: Common definitions for flash access.
@@ -7053,7 +7088,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/flash.h linux.dev/arch/mips/bcm94
 +#endif
 diff -urN linux.old/arch/mips/bcm947xx/include/flashutl.h linux.dev/arch/mips/bcm947xx/include/flashutl.h
 --- linux.old/arch/mips/bcm947xx/include/flashutl.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/flashutl.h	2005-12-15 15:34:48.160541750 +0100
++++ linux.dev/arch/mips/bcm947xx/include/flashutl.h	2005-12-28 16:37:32.878261500 +0100
 @@ -0,0 +1,27 @@
 +/*
 + * BCM47XX FLASH driver interface
@@ -7084,7 +7119,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/flashutl.h linux.dev/arch/mips/bc
 +#endif /* _flashutl_h_ */
 diff -urN linux.old/arch/mips/bcm947xx/include/hndmips.h linux.dev/arch/mips/bcm947xx/include/hndmips.h
 --- linux.old/arch/mips/bcm947xx/include/hndmips.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/hndmips.h	2005-12-15 15:34:53.396869000 +0100
++++ linux.dev/arch/mips/bcm947xx/include/hndmips.h	2005-12-28 16:37:32.878261500 +0100
 @@ -0,0 +1,16 @@
 +/*
 + * Alternate include file for HND sbmips.h since CFE also ships with
@@ -7104,7 +7139,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/hndmips.h linux.dev/arch/mips/bcm
 +#include "sbmips.h"
 diff -urN linux.old/arch/mips/bcm947xx/include/linux_osl.h linux.dev/arch/mips/bcm947xx/include/linux_osl.h
 --- linux.old/arch/mips/bcm947xx/include/linux_osl.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/linux_osl.h	2005-12-15 17:23:39.225126750 +0100
++++ linux.dev/arch/mips/bcm947xx/include/linux_osl.h	2005-12-28 16:37:32.878261500 +0100
 @@ -0,0 +1,331 @@
 +/*
 + * Linux OS Independent Layer
@@ -7439,7 +7474,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/linux_osl.h linux.dev/arch/mips/b
 +#endif	/* _linux_osl_h_ */
 diff -urN linux.old/arch/mips/bcm947xx/include/linuxver.h linux.dev/arch/mips/bcm947xx/include/linuxver.h
 --- linux.old/arch/mips/bcm947xx/include/linuxver.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/linuxver.h	2005-12-15 16:02:45.467929000 +0100
++++ linux.dev/arch/mips/bcm947xx/include/linuxver.h	2005-12-28 16:37:32.878261500 +0100
 @@ -0,0 +1,389 @@
 +/*
 + * Linux-specific abstractions to gain some independence from linux kernel versions.
@@ -7832,7 +7867,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/linuxver.h linux.dev/arch/mips/bc
 +#endif /* _linuxver_h_ */
 diff -urN linux.old/arch/mips/bcm947xx/include/mipsinc.h linux.dev/arch/mips/bcm947xx/include/mipsinc.h
 --- linux.old/arch/mips/bcm947xx/include/mipsinc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/mipsinc.h	2005-12-15 16:47:29.886633750 +0100
++++ linux.dev/arch/mips/bcm947xx/include/mipsinc.h	2005-12-28 16:37:32.878261500 +0100
 @@ -0,0 +1,552 @@
 +/*
 + * HND Run Time Environment for standalone MIPS programs.
@@ -8388,7 +8423,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/mipsinc.h linux.dev/arch/mips/bcm
 +#endif	/* _MISPINC_H */
 diff -urN linux.old/arch/mips/bcm947xx/include/osl.h linux.dev/arch/mips/bcm947xx/include/osl.h
 --- linux.old/arch/mips/bcm947xx/include/osl.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/osl.h	2005-12-15 15:35:08.321801750 +0100
++++ linux.dev/arch/mips/bcm947xx/include/osl.h	2005-12-28 16:37:32.878261500 +0100
 @@ -0,0 +1,42 @@
 +/*
 + * OS Abstraction Layer
@@ -8434,7 +8469,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/osl.h linux.dev/arch/mips/bcm947x
 +#endif	/* _osl_h_ */
 diff -urN linux.old/arch/mips/bcm947xx/include/pcicfg.h linux.dev/arch/mips/bcm947xx/include/pcicfg.h
 --- linux.old/arch/mips/bcm947xx/include/pcicfg.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/pcicfg.h	2005-12-15 15:36:31.719013750 +0100
++++ linux.dev/arch/mips/bcm947xx/include/pcicfg.h	2005-12-28 16:37:32.882261750 +0100
 @@ -0,0 +1,398 @@
 +/*
 + * pcicfg.h: PCI configuration  constants and structures.
@@ -8836,7 +8871,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/pcicfg.h linux.dev/arch/mips/bcm9
 +#endif
 diff -urN linux.old/arch/mips/bcm947xx/include/proto/ethernet.h linux.dev/arch/mips/bcm947xx/include/proto/ethernet.h
 --- linux.old/arch/mips/bcm947xx/include/proto/ethernet.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/proto/ethernet.h	2005-12-15 12:57:27.869191250 +0100
++++ linux.dev/arch/mips/bcm947xx/include/proto/ethernet.h	2005-12-28 16:37:32.882261750 +0100
 @@ -0,0 +1,145 @@
 +/*******************************************************************************
 + * $Id$
@@ -8985,7 +9020,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/proto/ethernet.h linux.dev/arch/m
 +#endif /* _NET_ETHERNET_H_ */
 diff -urN linux.old/arch/mips/bcm947xx/include/s5.h linux.dev/arch/mips/bcm947xx/include/s5.h
 --- linux.old/arch/mips/bcm947xx/include/s5.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/s5.h	2005-12-15 12:57:27.869191250 +0100
++++ linux.dev/arch/mips/bcm947xx/include/s5.h	2005-12-28 16:37:32.882261750 +0100
 @@ -0,0 +1,103 @@
 +#ifndef _S5_H_
 +#define _S5_H_
@@ -9092,7 +9127,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/s5.h linux.dev/arch/mips/bcm947xx
 +#endif /*!_S5_H_ */
 diff -urN linux.old/arch/mips/bcm947xx/include/sbchipc.h linux.dev/arch/mips/bcm947xx/include/sbchipc.h
 --- linux.old/arch/mips/bcm947xx/include/sbchipc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sbchipc.h	2005-12-15 15:35:20.458560250 +0100
++++ linux.dev/arch/mips/bcm947xx/include/sbchipc.h	2005-12-28 16:37:32.882261750 +0100
 @@ -0,0 +1,440 @@
 +/*
 + * SiliconBackplane Chipcommon core hardware definitions.
@@ -9536,7 +9571,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/sbchipc.h linux.dev/arch/mips/bcm
 +#endif	/* _SBCHIPC_H */
 diff -urN linux.old/arch/mips/bcm947xx/include/sbconfig.h linux.dev/arch/mips/bcm947xx/include/sbconfig.h
 --- linux.old/arch/mips/bcm947xx/include/sbconfig.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sbconfig.h	2005-12-15 15:35:24.538815250 +0100
++++ linux.dev/arch/mips/bcm947xx/include/sbconfig.h	2005-12-28 16:37:32.898262750 +0100
 @@ -0,0 +1,342 @@
 +/*
 + * Broadcom SiliconBackplane hardware register definitions.
@@ -9882,7 +9917,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/sbconfig.h linux.dev/arch/mips/bc
 +#endif	/* _SBCONFIG_H */
 diff -urN linux.old/arch/mips/bcm947xx/include/sbextif.h linux.dev/arch/mips/bcm947xx/include/sbextif.h
 --- linux.old/arch/mips/bcm947xx/include/sbextif.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sbextif.h	2005-12-15 16:48:55.651993750 +0100
++++ linux.dev/arch/mips/bcm947xx/include/sbextif.h	2005-12-28 16:37:32.898262750 +0100
 @@ -0,0 +1,242 @@
 +/*
 + * Hardware-specific External Interface I/O core definitions
@@ -10128,7 +10163,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/sbextif.h linux.dev/arch/mips/bcm
 +#endif	/* _SBEXTIF_H */
 diff -urN linux.old/arch/mips/bcm947xx/include/sbmemc.h linux.dev/arch/mips/bcm947xx/include/sbmemc.h
 --- linux.old/arch/mips/bcm947xx/include/sbmemc.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sbmemc.h	2005-12-15 15:35:31.567254500 +0100
++++ linux.dev/arch/mips/bcm947xx/include/sbmemc.h	2005-12-28 16:37:32.902263000 +0100
 @@ -0,0 +1,148 @@
 +/*
 + * BCM47XX Sonics SiliconBackplane DDR/SDRAM controller core hardware definitions.
@@ -10280,7 +10315,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/sbmemc.h linux.dev/arch/mips/bcm9
 +#endif	/* _SBMEMC_H */
 diff -urN linux.old/arch/mips/bcm947xx/include/sbmips.h linux.dev/arch/mips/bcm947xx/include/sbmips.h
 --- linux.old/arch/mips/bcm947xx/include/sbmips.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sbmips.h	2005-12-15 16:46:57.616617000 +0100
++++ linux.dev/arch/mips/bcm947xx/include/sbmips.h	2005-12-28 16:37:32.902263000 +0100
 @@ -0,0 +1,62 @@
 +/*
 + * Broadcom SiliconBackplane MIPS definitions
@@ -10346,7 +10381,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/sbmips.h linux.dev/arch/mips/bcm9
 +#endif	/* _SBMIPS_H */
 diff -urN linux.old/arch/mips/bcm947xx/include/sbpci.h linux.dev/arch/mips/bcm947xx/include/sbpci.h
 --- linux.old/arch/mips/bcm947xx/include/sbpci.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sbpci.h	2005-12-15 15:35:36.795581250 +0100
++++ linux.dev/arch/mips/bcm947xx/include/sbpci.h	2005-12-28 16:37:32.902263000 +0100
 @@ -0,0 +1,122 @@
 +/*
 + * BCM47XX Sonics SiliconBackplane PCI core hardware definitions.
@@ -10472,7 +10507,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/sbpci.h linux.dev/arch/mips/bcm94
 +#endif	/* _SBPCI_H */
 diff -urN linux.old/arch/mips/bcm947xx/include/sbsdram.h linux.dev/arch/mips/bcm947xx/include/sbsdram.h
 --- linux.old/arch/mips/bcm947xx/include/sbsdram.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sbsdram.h	2005-12-15 15:35:40.175792500 +0100
++++ linux.dev/arch/mips/bcm947xx/include/sbsdram.h	2005-12-28 16:37:32.902263000 +0100
 @@ -0,0 +1,75 @@
 +/*
 + * BCM47XX Sonics SiliconBackplane SDRAM controller core hardware definitions.
@@ -10551,7 +10586,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/sbsdram.h linux.dev/arch/mips/bcm
 +#endif	/* _SBSDRAM_H */
 diff -urN linux.old/arch/mips/bcm947xx/include/sbutils.h linux.dev/arch/mips/bcm947xx/include/sbutils.h
 --- linux.old/arch/mips/bcm947xx/include/sbutils.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sbutils.h	2005-12-15 16:00:47.404550500 +0100
++++ linux.dev/arch/mips/bcm947xx/include/sbutils.h	2005-12-28 16:37:32.902263000 +0100
 @@ -0,0 +1,136 @@
 +/*
 + * Misc utility routines for accessing chip-specific features
@@ -10691,7 +10726,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/sbutils.h linux.dev/arch/mips/bcm
 +#endif	/* _sbutils_h_ */
 diff -urN linux.old/arch/mips/bcm947xx/include/sflash.h linux.dev/arch/mips/bcm947xx/include/sflash.h
 --- linux.old/arch/mips/bcm947xx/include/sflash.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/sflash.h	2005-12-15 16:49:23.001703000 +0100
++++ linux.dev/arch/mips/bcm947xx/include/sflash.h	2005-12-28 16:37:32.902263000 +0100
 @@ -0,0 +1,36 @@
 +/*
 + * Broadcom SiliconBackplane chipcommon serial flash interface
@@ -10731,7 +10766,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/sflash.h linux.dev/arch/mips/bcm9
 +#endif /* _sflash_h_ */
 diff -urN linux.old/arch/mips/bcm947xx/include/trxhdr.h linux.dev/arch/mips/bcm947xx/include/trxhdr.h
 --- linux.old/arch/mips/bcm947xx/include/trxhdr.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/trxhdr.h	2005-12-15 15:35:49.220357750 +0100
++++ linux.dev/arch/mips/bcm947xx/include/trxhdr.h	2005-12-28 16:37:32.902263000 +0100
 @@ -0,0 +1,33 @@
 +/*
 + * TRX image file header format.
@@ -10768,7 +10803,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/trxhdr.h linux.dev/arch/mips/bcm9
 +typedef struct trx_header TRXHDR, *PTRXHDR;
 diff -urN linux.old/arch/mips/bcm947xx/include/typedefs.h linux.dev/arch/mips/bcm947xx/include/typedefs.h
 --- linux.old/arch/mips/bcm947xx/include/typedefs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/include/typedefs.h	2005-12-15 15:35:52.436558750 +0100
++++ linux.dev/arch/mips/bcm947xx/include/typedefs.h	2005-12-28 16:37:32.906263250 +0100
 @@ -0,0 +1,326 @@
 +/*
 + * Copyright 2005, Broadcom Corporation      
@@ -11098,7 +11133,7 @@ diff -urN linux.old/arch/mips/bcm947xx/include/typedefs.h linux.dev/arch/mips/bc
 +#endif /* _TYPEDEFS_H_ */
 diff -urN linux.old/arch/mips/bcm947xx/int-handler.S linux.dev/arch/mips/bcm947xx/int-handler.S
 --- linux.old/arch/mips/bcm947xx/int-handler.S	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/int-handler.S	2005-12-15 12:57:27.877187750 +0100
++++ linux.dev/arch/mips/bcm947xx/int-handler.S	2005-12-28 16:37:32.906263250 +0100
 @@ -0,0 +1,48 @@
 +/*
 + *  Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
@@ -11150,7 +11185,7 @@ diff -urN linux.old/arch/mips/bcm947xx/int-handler.S linux.dev/arch/mips/bcm947x
 +	END(bcm47xx_irq_handler)
 diff -urN linux.old/arch/mips/bcm947xx/irq.c linux.dev/arch/mips/bcm947xx/irq.c
 --- linux.old/arch/mips/bcm947xx/irq.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/irq.c	2005-12-15 12:57:27.877187750 +0100
++++ linux.dev/arch/mips/bcm947xx/irq.c	2005-12-28 16:37:32.906263250 +0100
 @@ -0,0 +1,67 @@
 +/*
 + *  Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
@@ -11221,7 +11256,7 @@ diff -urN linux.old/arch/mips/bcm947xx/irq.c linux.dev/arch/mips/bcm947xx/irq.c
 +}
 diff -urN linux.old/arch/mips/bcm947xx/pci.c linux.dev/arch/mips/bcm947xx/pci.c
 --- linux.old/arch/mips/bcm947xx/pci.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/pci.c	2005-12-18 07:01:36.731635000 +0100
++++ linux.dev/arch/mips/bcm947xx/pci.c	2005-12-28 16:37:32.906263250 +0100
 @@ -0,0 +1,215 @@
 +#include <linux/kernel.h>
 +#include <linux/init.h>
@@ -11440,7 +11475,7 @@ diff -urN linux.old/arch/mips/bcm947xx/pci.c linux.dev/arch/mips/bcm947xx/pci.c
 +DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, bcm47xx_fixup_bridge);
 diff -urN linux.old/arch/mips/bcm947xx/prom.c linux.dev/arch/mips/bcm947xx/prom.c
 --- linux.old/arch/mips/bcm947xx/prom.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/prom.c	2005-12-15 12:57:27.877187750 +0100
++++ linux.dev/arch/mips/bcm947xx/prom.c	2005-12-28 16:37:32.906263250 +0100
 @@ -0,0 +1,59 @@
 +/*
 + *  Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
@@ -11503,7 +11538,7 @@ diff -urN linux.old/arch/mips/bcm947xx/prom.c linux.dev/arch/mips/bcm947xx/prom.
 +}
 diff -urN linux.old/arch/mips/bcm947xx/setup.c linux.dev/arch/mips/bcm947xx/setup.c
 --- linux.old/arch/mips/bcm947xx/setup.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/setup.c	2005-12-18 06:34:52.106215250 +0100
++++ linux.dev/arch/mips/bcm947xx/setup.c	2005-12-28 19:29:25.870911750 +0100
 @@ -0,0 +1,157 @@
 +/*
 + *  Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
@@ -11641,7 +11676,7 @@ diff -urN linux.old/arch/mips/bcm947xx/setup.c linux.dev/arch/mips/bcm947xx/setu
 +	boardflags = getintvar(NULL, "boardflags");
 +
 +	/* reverse serial ports if the nvram variable kernel_args starts with console=ttyS1 */
-+	s = nvram_get("kernel_args");
++	s = early_nvram_get("kernel_args");
 +	if (!s)	s = "";
 +	if (!strncmp(s, "console=ttyS1", 13)) {
 +		for (i = num_ports; i; i--)
@@ -11664,7 +11699,7 @@ diff -urN linux.old/arch/mips/bcm947xx/setup.c linux.dev/arch/mips/bcm947xx/setu
 +EXPORT_SYMBOL(boardflags);
 diff -urN linux.old/arch/mips/bcm947xx/time.c linux.dev/arch/mips/bcm947xx/time.c
 --- linux.old/arch/mips/bcm947xx/time.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/arch/mips/bcm947xx/time.c	2005-12-15 12:57:27.877187750 +0100
++++ linux.dev/arch/mips/bcm947xx/time.c	2005-12-28 16:37:32.906263250 +0100
 @@ -0,0 +1,59 @@
 +/*
 + *  Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
@@ -11726,8 +11761,8 @@ diff -urN linux.old/arch/mips/bcm947xx/time.c linux.dev/arch/mips/bcm947xx/time.
 +	setup_irq(7, irq);
 +}
 diff -urN linux.old/arch/mips/kernel/cpu-probe.c linux.dev/arch/mips/kernel/cpu-probe.c
---- linux.old/arch/mips/kernel/cpu-probe.c	2005-12-15 13:26:49.766024000 +0100
-+++ linux.dev/arch/mips/kernel/cpu-probe.c	2005-12-15 12:57:27.901177250 +0100
+--- linux.old/arch/mips/kernel/cpu-probe.c	2005-12-19 01:36:54.000000000 +0100
++++ linux.dev/arch/mips/kernel/cpu-probe.c	2005-12-28 16:37:32.934265000 +0100
 @@ -656,6 +656,28 @@
  }
  
@@ -11768,8 +11803,8 @@ diff -urN linux.old/arch/mips/kernel/cpu-probe.c linux.dev/arch/mips/kernel/cpu-
  		cpu_probe_sandcraft(c);
  		break;
 diff -urN linux.old/arch/mips/kernel/head.S linux.dev/arch/mips/kernel/head.S
---- linux.old/arch/mips/kernel/head.S	2005-12-15 13:26:49.766024000 +0100
-+++ linux.dev/arch/mips/kernel/head.S	2005-12-15 12:57:27.901177250 +0100
+--- linux.old/arch/mips/kernel/head.S	2005-12-19 01:36:54.000000000 +0100
++++ linux.dev/arch/mips/kernel/head.S	2005-12-28 16:37:32.934265000 +0100
 @@ -107,6 +107,14 @@
  #endif
  	.endm
@@ -11786,8 +11821,8 @@ diff -urN linux.old/arch/mips/kernel/head.S linux.dev/arch/mips/kernel/head.S
  	 * Reserved space for exception handlers.
  	 * Necessary for machines which link their kernels at KSEG0.
 diff -urN linux.old/arch/mips/kernel/proc.c linux.dev/arch/mips/kernel/proc.c
---- linux.old/arch/mips/kernel/proc.c	2005-12-15 13:26:49.766024000 +0100
-+++ linux.dev/arch/mips/kernel/proc.c	2005-12-15 12:57:27.921168500 +0100
+--- linux.old/arch/mips/kernel/proc.c	2005-12-19 01:36:54.000000000 +0100
++++ linux.dev/arch/mips/kernel/proc.c	2005-12-28 16:37:32.946265750 +0100
 @@ -82,6 +82,8 @@
  	[CPU_VR4181]	= "NEC VR4181",
  	[CPU_VR4181A]	= "NEC VR4181A",
@@ -11798,8 +11833,8 @@ diff -urN linux.old/arch/mips/kernel/proc.c linux.dev/arch/mips/kernel/proc.c
  };
  
 diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c
---- linux.old/arch/mips/mm/tlbex.c	2005-12-15 13:26:49.794011750 +0100
-+++ linux.dev/arch/mips/mm/tlbex.c	2005-12-15 12:57:27.945158000 +0100
+--- linux.old/arch/mips/mm/tlbex.c	2005-12-19 01:36:54.000000000 +0100
++++ linux.dev/arch/mips/mm/tlbex.c	2005-12-28 16:37:32.970267250 +0100
 @@ -858,6 +858,8 @@
  	case CPU_4KSC:
  	case CPU_20KC:
@@ -11810,8 +11845,8 @@ diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c
  		break;
  
 diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/bootinfo.h
---- linux.old/include/asm-mips/bootinfo.h	2005-12-15 13:26:49.818001250 +0100
-+++ linux.dev/include/asm-mips/bootinfo.h	2005-12-15 12:57:27.969147500 +0100
+--- linux.old/include/asm-mips/bootinfo.h	2005-12-19 01:36:54.000000000 +0100
++++ linux.dev/include/asm-mips/bootinfo.h	2005-12-28 16:37:32.970267250 +0100
 @@ -218,6 +218,12 @@
  #define MACH_GROUP_TITAN       22	/* PMC-Sierra Titan		*/
  #define  MACH_TITAN_YOSEMITE	1	/* PMC-Sierra Yosemite		*/
@@ -11826,8 +11861,8 @@ diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/booti
  
  const char *get_system_type(void);
 diff -urN linux.old/include/asm-mips/cpu.h linux.dev/include/asm-mips/cpu.h
---- linux.old/include/asm-mips/cpu.h	2005-12-15 13:26:49.818001250 +0100
-+++ linux.dev/include/asm-mips/cpu.h	2005-12-15 12:57:27.969147500 +0100
+--- linux.old/include/asm-mips/cpu.h	2005-12-19 01:36:54.000000000 +0100
++++ linux.dev/include/asm-mips/cpu.h	2005-12-28 16:37:32.974267500 +0100
 @@ -102,6 +102,13 @@
  #define PRID_IMP_SR71000        0x0400
  
@@ -11854,8 +11889,8 @@ diff -urN linux.old/include/asm-mips/cpu.h linux.dev/include/asm-mips/cpu.h
  /*
   * ISA Level encodings
 diff -urN linux.old/include/linux/init.h linux.dev/include/linux/init.h
---- linux.old/include/linux/init.h	2005-12-15 13:26:49.818001250 +0100
-+++ linux.dev/include/linux/init.h	2005-12-15 12:57:27.973145750 +0100
+--- linux.old/include/linux/init.h	2005-12-19 01:36:54.000000000 +0100
++++ linux.dev/include/linux/init.h	2005-12-28 16:37:32.982268000 +0100
 @@ -86,6 +86,8 @@
  	static initcall_t __initcall_##fn __attribute_used__ \
  	__attribute__((__section__(".initcall" level ".init"))) = fn
@@ -11866,9 +11901,9 @@ diff -urN linux.old/include/linux/init.h linux.dev/include/linux/init.h
  #define postcore_initcall(fn)		__define_initcall("2",fn)
  #define arch_initcall(fn)		__define_initcall("3",fn)
 diff -urN linux.old/include/linux/pci_ids.h linux.dev/include/linux/pci_ids.h
---- linux.old/include/linux/pci_ids.h	2005-12-15 13:26:49.818001250 +0100
-+++ linux.dev/include/linux/pci_ids.h	2005-12-15 12:57:27.977144000 +0100
-@@ -1835,6 +1835,7 @@
+--- linux.old/include/linux/pci_ids.h	2005-12-19 01:36:54.000000000 +0100
++++ linux.dev/include/linux/pci_ids.h	2005-12-28 16:37:32.994268750 +0100
+@@ -1836,6 +1836,7 @@
  #define PCI_DEVICE_ID_TIGON3_5901_2	0x170e
  #define PCI_DEVICE_ID_BCM4401		0x4401
  #define PCI_DEVICE_ID_BCM4401B0		0x4402