update to 2.6.29

fixed trivial conflict in scripts-kconfig-reportoldconfig.patch
bnx2 firmware patch needs little work
several arm patches disabled as they no longer apply

svn path=/dists/trunk/linux-2.6/; revision=13217
This commit is contained in:
Maximilian Attems 2009-03-24 00:40:04 +00:00
parent e9b9efcec2
commit c3881032d0
3 changed files with 12 additions and 12 deletions

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
linux-2.6 (2.6.29~rc8-1~experimental.1) UNRELEASED; urgency=low
linux-2.6 (2.6.29-1~experimental.1) UNRELEASED; urgency=low
* New upstream release
- tg3 use request_firmware and firmware nuked.

View File

@ -39,7 +39,7 @@ index 3e1057f..e526d00 100644
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -433,12 +434,13 @@ int main(int ac, char **av)
@@ -434,12 +435,13 @@ int main(int ac, char **av)
int opt;
const char *name;
struct stat tmpstat;
@ -54,10 +54,10 @@ index 3e1057f..e526d00 100644
switch (opt) {
case 'o':
input_mode = ask_silent;
@@ -467,6 +469,14 @@ int main(int ac, char **av)
@@ -481,6 +482,14 @@ int main(int ac, char **av)
input_mode = set_random;
srand(time(NULL));
break;
}
+ case 'R':
+ input_mode = set_default;
+ report = update = true;
@ -69,7 +69,7 @@ index 3e1057f..e526d00 100644
case 'h':
printf(_("See README for usage info\n"));
exit(0);
@@ -498,13 +508,17 @@ int main(int ac, char **av)
@@ -512,13 +522,17 @@ int main(int ac, char **av)
switch (input_mode) {
case set_default:
@ -94,7 +94,7 @@ index 3e1057f..e526d00 100644
}
break;
case ask_silent:
@@ -580,6 +594,9 @@ int main(int ac, char **av)
@@ -594,6 +608,9 @@ int main(int ac, char **av)
break;
}

View File

@ -6,7 +6,7 @@
+ debian/drivers-ata-ata_piix-postpone-pata.patch
+ debian/drivers-ata-pata_sis-postpone-pata.patch
+ debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
#+ debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
+ features/all/drivers-gpu-drm-mga-request_firmware.patch
+ features/all/drivers-gpu-drm-r128-request_firmware.patch
+ features/all/drivers-gpu-drm-radeon-request_firmware.patch
@ -32,10 +32,10 @@
+ features/arm/mv-sdio.patch
+ features/arm/kw-register-sdio.patch
+ features/arm/kw-register-internal-devices.patch
+ features/arm/kw-sheevaplug.patch
+ features/arm/kw-sheevaplug-usb-power.patch
+ features/arm/kw-sheevaplug-led.patch
#+ features/arm/kw-sheevaplug.patch
#+ features/arm/kw-sheevaplug-usb-power.patch
#+ features/arm/kw-sheevaplug-led.patch
+ features/arm/kw-hook-up-i2c.patch
+ features/arm/kw-dont-init-rtc.patch
#+ features/arm/kw-dont-init-rtc.patch
+ features/arm/kw-consistency-mpp.patch
+ features/arm/ts219.patch
#+ features/arm/ts219.patch