remove mkdep fix, now handled by ../generic/209-mkdep_fix.patch

[openwrt.git] / openwrt / target / linux / linux-2.4 / patches / brcm / 001-bcm47xx.patch

diff --git a/openwrt/target/linux/linux-2.4/patches/brcm/001-bcm47xx.patch b/openwrt/target/linux/linux-2.4/patches/brcm/001-bcm47xx.patch
index 7a61637..8dd4e3e 100644 (file)
--- a/openwrt/target/linux/linux-2.4/patches/brcm/001-bcm47xx.patch
+++ b/openwrt/target/linux/linux-2.4/patches/brcm/001-bcm47xx.patch
@@ -34,15 +34,6 @@ diff -urN linux.old/Makefile linux.dev/Makefile
          (echo KERNELRELEASE \"$(KERNELRELEASE)\" exceeds $(uts_len) characters >&2; false)
        @echo \#define UTS_RELEASE \"$(KERNELRELEASE)\" > .ver
        @echo \#define LINUX_VERSION_CODE `expr $(VERSION) \\* 65536 + $(PATCHLEVEL) \\* 256 + $(SUBLEVEL)` >> .ver
-@@ -501,7 +503,7 @@
- ifdef CONFIG_MODVERSIONS
-       $(MAKE) update-modverfile
- endif
--      scripts/mkdep -- `find $(FINDHPATH) \( -name SCCS -o -name .svn \) -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend
-+      (find $(FINDHPATH) \( -name SCCS -o -name .svn \) -prune -o -follow -name \*.h ! -name modversions.h -print | xargs -r scripts/mkdep -- ) > .hdepend
-       scripts/mkdep -- init/*.c > .depend
- 
- ifdef CONFIG_MODVERSIONS
 diff -urN linux.old/Rules.make linux.dev/Rules.make
 --- linux.old/Rules.make       2005-11-07 23:12:50.538884250 +0100
 +++ linux.dev/Rules.make       2005-11-07 21:57:07.837585250 +0100
@@ -19210,8 +19201,8 @@ diff -urN linux.old/drivers/net/hnd/linux_osl.c linux.dev/drivers/net/hnd/linux_
 +#endif        /* BINOSL */
 diff -urN linux.old/drivers/net/hnd/sbutils.c linux.dev/drivers/net/hnd/sbutils.c
 --- linux.old/drivers/net/hnd/sbutils.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux.dev/drivers/net/hnd/sbutils.c        2005-11-08 12:54:06.123274250 +0100
-@@ -0,0 +1,2823 @@
++++ linux.dev/drivers/net/hnd/sbutils.c        2005-11-08 17:58:18.918914500 +0100
+@@ -0,0 +1,2837 @@
 +/*
 + * Misc utility routines for accessing chip-specific features
 + * of the SiliconBackplane-based Broadcom chips.
@@ -21068,6 +21059,8 @@ diff -urN linux.old/drivers/net/hnd/sbutils.c linux.dev/drivers/net/hnd/sbutils.
 +      si = SB_INFO(sbh);
 +      regoff = 0;
 +
++      priority = GPIO_DRV_PRIORITY; /* compatibility hack */
++
 +      /* gpios could be shared on router platforms */
 +      if ((BUSTYPE(si->sb.bustype) == SB_BUS) && (val || mask)) {
 +              mask = priority ? (sb_gpioreservation & mask) :
@@ -21101,6 +21094,8 @@ diff -urN linux.old/drivers/net/hnd/sbutils.c linux.dev/drivers/net/hnd/sbutils.
 +      si = SB_INFO(sbh);
 +      regoff = 0;
 +
++      priority = GPIO_DRV_PRIORITY; /* compatibility hack */
++
 +      /* gpios could be shared on router platforms */
 +      if ((BUSTYPE(si->sb.bustype) == SB_BUS) && (val || mask)) {
 +              mask = priority ? (sb_gpioreservation & mask) :
@@ -21135,6 +21130,8 @@ diff -urN linux.old/drivers/net/hnd/sbutils.c linux.dev/drivers/net/hnd/sbutils.
 +      si = SB_INFO(sbh);
 +      regoff = 0;
 +
++      priority = GPIO_DRV_PRIORITY; /* compatibility hack */
++
 +      /* gpios could be shared on router platforms */
 +      if ((BUSTYPE(si->sb.bustype) == SB_BUS) && (val || mask)) {
 +              mask = priority ? (sb_gpioreservation & mask) :
@@ -21167,6 +21164,8 @@ diff -urN linux.old/drivers/net/hnd/sbutils.c linux.dev/drivers/net/hnd/sbutils.
 +
 +      si = SB_INFO(sbh);
 +
++      priority = GPIO_DRV_PRIORITY; /* compatibility hack */
++
 +      /* only cores on SB_BUS share GPIO's and only applcation users need to reserve/release GPIO */
 +      if ( (BUSTYPE(si->sb.bustype) != SB_BUS) || (!priority))  {
 +              ASSERT((BUSTYPE(si->sb.bustype) == SB_BUS) && (priority));
@@ -21200,6 +21199,8 @@ diff -urN linux.old/drivers/net/hnd/sbutils.c linux.dev/drivers/net/hnd/sbutils.
 +
 +      si = SB_INFO(sbh);
 +
++      priority = GPIO_DRV_PRIORITY; /* compatibility hack */
++
 +      /* only cores on SB_BUS share GPIO's and only applcation users need to reserve/release GPIO */
 +      if ( (BUSTYPE(si->sb.bustype) != SB_BUS) || (!priority))  {
 +              ASSERT((BUSTYPE(si->sb.bustype) == SB_BUS) && (priority));
@@ -21258,6 +21259,8 @@ diff -urN linux.old/drivers/net/hnd/sbutils.c linux.dev/drivers/net/hnd/sbutils.
 +      si = SB_INFO(sbh);
 +      regoff = 0;
 +
++      priority = GPIO_DRV_PRIORITY; /* compatibility hack */
++
 +      /* gpios could be shared on router platforms */
 +      if ((BUSTYPE(si->sb.bustype) == SB_BUS) && (val || mask)) {
 +              mask = priority ? (sb_gpioreservation & mask) :
@@ -21293,6 +21296,8 @@ diff -urN linux.old/drivers/net/hnd/sbutils.c linux.dev/drivers/net/hnd/sbutils.
 +      si = SB_INFO(sbh);
 +      regoff = 0;
 +
++      priority = GPIO_DRV_PRIORITY; /* compatibility hack */
++
 +      /* gpios could be shared on router platforms */
 +      if ((BUSTYPE(si->sb.bustype) == SB_BUS) && (val || mask)) {
 +              mask = priority ? (sb_gpioreservation & mask) :