aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-07-03 16:48:36 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-07-03 16:48:36 -0700
commit1437c779d4e74fa6b0695ce154bf722d9de98889 (patch)
tree4ddc42fff5adc7be3101629e32b34a1f7499d135
parentd2242d594ac6129269d3356ff73310fccaebfa61 (diff)
downloadpatches-1437c779d4e74fa6b0695ce154bf722d9de98889.tar.gz
2.6.26-rc8-git3
-rw-r--r--driver-core/rt2x00-treat-firmware-data-as-const.patch4
-rw-r--r--version2
2 files changed, 3 insertions, 3 deletions
diff --git a/driver-core/rt2x00-treat-firmware-data-as-const.patch b/driver-core/rt2x00-treat-firmware-data-as-const.patch
index 7cfab90be544bb..84508ca38bac0c 100644
--- a/driver-core/rt2x00-treat-firmware-data-as-const.patch
+++ b/driver-core/rt2x00-treat-firmware-data-as-const.patch
@@ -59,7 +59,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
int i;
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
-@@ -850,7 +850,7 @@ static char *rt73usb_get_firmware_name(s
+@@ -856,7 +856,7 @@ static char *rt73usb_get_firmware_name(s
return FIRMWARE_RT2571;
}
@@ -68,7 +68,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
{
u16 crc;
-@@ -867,13 +867,13 @@ static u16 rt73usb_get_firmware_crc(void
+@@ -873,13 +873,13 @@ static u16 rt73usb_get_firmware_crc(void
return crc;
}
diff --git a/version b/version
index 46a0aaa81c86a1..81456430bbbff9 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.26-rc8-git2
+2.6.26-rc8-git3