Merge bcm43xx-mac80211 driver from tree at bu3sch.de, pulled 24/6

[openwrt.git] / package / br2684ctl / patches / 100-debian.patch

diff --git a/package/br2684ctl/patches/100-debian.patch b/package/br2684ctl/patches/100-debian.patch
index bfcd4ec..45f6364 100644 (file)
--- a/package/br2684ctl/patches/100-debian.patch
+++ b/package/br2684ctl/patches/100-debian.patch
@@ -1,5 +1,7 @@
---- br2684ctl-20040226.orig/br2684ctl.c
-+++ br2684ctl-20040226/br2684ctl.c
+Index: br2684ctl-20040226.orig/br2684ctl.c
+===================================================================
+--- br2684ctl-20040226.orig.orig/br2684ctl.c   2007-06-04 13:22:22.142489112 +0200
++++ br2684ctl-20040226.orig/br2684ctl.c        2007-06-04 13:22:22.213478320 +0200
 @@ -3,6 +3,8 @@
  #include <unistd.h>
  #include <errno.h>
@@ -73,8 +75,10 @@
    return 0;
  }
  
---- br2684ctl-20040226.orig/Makefile
-+++ br2684ctl-20040226/Makefile
+Index: br2684ctl-20040226.orig/Makefile
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ br2684ctl-20040226.orig/Makefile   2007-06-04 13:22:22.215478016 +0200
 @@ -0,0 +1,13 @@
 +OPTS := -O2
 +CFLAGS := -Wall -g