rename sched/tsc patch for trunk

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

diff --git a/target/linux/linux-2.4/patches/brcm/001-bcm47xx.patch b/target/linux/linux-2.4/patches/brcm/001-bcm47xx.patch
index 7a61637..9fb53d0 100644 (file)
--- a/target/linux/linux-2.4/patches/brcm/001-bcm47xx.patch
+++ b/target/linux/linux-2.4/patches/brcm/001-bcm47xx.patch
@@ -19210,8 +19210,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 +21068,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 +21103,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 +21139,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 +21173,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 +21208,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 +21268,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 +21305,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) :