resync patch

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.24 / 601-br2684-routed-support.patch

diff --git a/target/linux/generic-2.6/patches-2.6.24/601-br2684-routed-support.patch b/target/linux/generic-2.6/patches-2.6.24/601-br2684-routed-support.patch
index 88a27f3..0d68832 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/601-br2684-routed-support.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/601-br2684-routed-support.patch
@@ -1,6 +1,5 @@
-diff -Nur linux-2.6.24.2/include/linux/atmbr2684.h linux-2.6.24.2-copy/include/linux/atmbr2684.h
---- linux-2.6.24.2/include/linux/atmbr2684.h   2008-02-11 05:51:11.000000000 +0000
-+++ linux-2.6.24.2-copy/include/linux/atmbr2684.h      2008-03-27 01:08:42.000000000 +0000
+--- a/include/linux/atmbr2684.h
++++ b/include/linux/atmbr2684.h
 @@ -14,6 +14,9 @@
  #define BR2684_MEDIA_FDDI     (3)
  #define BR2684_MEDIA_802_6    (4)     /* 802.6 */
@@ -103,9 +102,8 @@ diff -Nur linux-2.6.24.2/include/linux/atmbr2684.h linux-2.6.24.2-copy/include/l
  
  #endif /* _LINUX_ATMBR2684_H */
 +
-diff -Nur linux-2.6.24.2/net/atm/br2684.c linux-2.6.24.2-copy/net/atm/br2684.c
---- linux-2.6.24.2/net/atm/br2684.c    2008-02-11 05:51:11.000000000 +0000
-+++ linux-2.6.24.2-copy/net/atm/br2684.c       2008-03-27 03:24:17.000000000 +0000
+--- a/net/atm/br2684.c
++++ b/net/atm/br2684.c
 @@ -1,8 +1,10 @@
  /*
 -Experimental ethernet netdevice using ATM AAL5 as underlying carrier