[kernel] r12117 - in dists/trunk/linux-2.6/debian: . patches/bugfix/arm patches/debian/dfsg patches/features/arm patches/series

[Bastian Blank]

Author: waldi
Date: Thu Aug 21 09:42:59 2008
New Revision: 12117

Log:
debian/changelog: Set version to 2.6.27~rc4-1~experimental.1.
* debian/patches/debian/dfsg/drivers-net-bnx2-request_firmware-1.patch,
  debian/patches/bugfix/arm/ixp4xx_eth-build-fix.patch,
  debian/patches/bugfix/arm/tsx09-fix-mac.patch,
  debian/patches/bugfix/arm/tsx09-init-uart1.patch: Fix.
* debian/patches/features/arm/5281d0.patch,
  debian/patches/features/arm/ts409-export-leds.patch,
  debian/patches/features/arm/ts409-export-reset.patch,
  debian/patches/features/arm/tsx09-fix-key-codes.patch: Remove as merged.
* debian/patches/series/1~experimental.1: Remove patches.


Removed:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/ixp4xx_eth-build-fix.patch
   dists/trunk/linux-2.6/debian/patches/features/arm/5281d0.patch
   dists/trunk/linux-2.6/debian/patches/features/arm/ts409-export-leds.patch
   dists/trunk/linux-2.6/debian/patches/features/arm/ts409-export-reset.patch
   dists/trunk/linux-2.6/debian/patches/features/arm/tsx09-fix-key-codes.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/tsx09-fix-mac.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/tsx09-init-uart1.patch
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Aug 21 09:42:59 2008
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.27~rc3-1~experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.27~rc4-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream release
 

Modified: dists/trunk/linux-2.6/debian/patches/bugfix/arm/tsx09-fix-mac.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/arm/tsx09-fix-mac.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/tsx09-fix-mac.patch	Thu Aug 21 09:42:59 2008
@@ -22,8 +22,8 @@
  	orion5x_ehci1_init();
  	qnap_tsx09_find_mac_addr(QNAP_TS209_NOR_BOOT_BASE +
 @@ -297,10 +301,6 @@ static void __init qnap_ts209_init(void)
- 	orion5x_sata_init(&qnap_ts209_sata_data);
  	orion5x_uart0_init();
+ 	orion5x_xor_init();
  
 -	orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE,
 -				   QNAP_TS209_NOR_BOOT_SIZE);

Modified: dists/trunk/linux-2.6/debian/patches/bugfix/arm/tsx09-init-uart1.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/arm/tsx09-init-uart1.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/tsx09-init-uart1.patch	Thu Aug 21 09:42:59 2008
@@ -12,9 +12,9 @@
  	orion5x_sata_init(&qnap_ts209_sata_data);
  	orion5x_uart0_init();
 +	orion5x_uart1_init();
+ 	orion5x_xor_init();
  
  	platform_device_register(&qnap_ts209_button_device);
- 
 --- a/arch/arm/mach-orion5x/ts409-setup.c	2008-08-13 07:39:55.000000000 +0000
 +++ b/arch/arm/mach-orion5x/ts409-setup.c	2008-08-13 07:40:10.000000000 +0000
 @@ -293,6 +293,7 @@

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2-request_firmware-1.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2-request_firmware-1.patch	Thu Aug 21 09:42:59 2008
@@ -20,8 +20,8 @@
  
 @@ -59,12 +59,20 @@
  #define PFX DRV_MODULE_NAME	": "
- #define DRV_MODULE_VERSION	"1.7.9"
- #define DRV_MODULE_RELDATE	"July 18, 2008"
+ #define DRV_MODULE_VERSION	"1.8.0"
+ #define DRV_MODULE_RELDATE	"Aug 14, 2008"
 +#define FW_FILE_06		"bnx2-06-4.4.1.fw"
 +#define FW_FILE_09		"bnx2-09-4.4.26.fw"
  

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Thu Aug 21 09:42:59 2008
@@ -27,13 +27,8 @@
 + bugfix/arm/disable-ath5k.patch
 + bugfix/arm/disable-r6040.patch
 + bugfix/arm/kurobox_fix_nr_controllers.patch
-+ bugfix/arm/ixp4xx_eth-build-fix.patch
 + bugfix/arm/tsx09-fix-mac.patch
 + bugfix/arm/tsx09-init-uart1.patch
-+ features/arm/5281d0.patch
-+ features/arm/ts409-export-leds.patch
-+ features/arm/tsx09-fix-key-codes.patch
-+ features/arm/ts409-export-reset.patch
 + features/all/at76.patch 
 + bugfix/fix-hifn_795X-divdi3.patch
 + bugfix/all/mtd-prevent-physmap-from-causing-request_module-runaway-loop-modprobe-net-pf-1.patch