linux24benh update

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1311 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -1,4 +1,8 @@
 
+*) 2003-09-03 (2.0.0-rc1 - 2.0.0-rc2)
+
+ - updated linux24benh
+
 *) 2003-09-02 (2.0.0-rc1 - 2.0.0-rc2)
 
  - Sebastian Jaenicke: updated bsd-games, ircii and dialog

architecture/powerpc/config.in

@@ -21,12 +21,12 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 choice ROCKCFG_POWERPC_ISA common \
-	common		"Utilize the common subset of POWER and PowerPC"	\
-	power		"Optimised for POWER"				\
-	power2		"Optimised for POWER2"				\
-	601		"Optimised for mixed POWER/PowerPC (only MPC601)"	\
-	powerpc		"Optimised for pure PowerPC"			\
-	powerpc64	"Optimised for PowerPC64"
+	common		"Utilise the common subset of POWER and PowerPC"	\
+	power		"Utilise the POWER ISA"				\
+	power2		"Utilise the POWER2 ISA"			\
+	601		"Utilise the mixed POWER/PowerPC (only MPC601) ISA"	\
+	powerpc		"Utilise the PowerPC ISA"			\
+	powerpc64	"Utilise the PowerPC64 ISA"
 
 choice ROCKCFG_POWERPC_OPT generic \
 	generic		"No special optimisation"			\

package/powerpc/linux24benh-header/linux24benh-header.desc

@@ -38,12 +38,12 @@
 
 [E] group kernel-src
 
-[O] vanilla_ver="2.4.21"
-[O] var_append patchfiles " " "patch-2.4.21-ben2.bz2"
+[O] vanilla_ver="2.4.22"
+[O] var_append patchfiles " " "patch-2.4.22-ben2.bz2"
 
 [L] GPL
 [S] Stable
-[V] 2.4.21-benh2
+[V] 2.4.22-benh2
 [P] X 01-------9 104.000
 [R] + powerpc
 

package/powerpc/linux24benh-src/linux24benh-src.desc

@@ -38,12 +38,12 @@
 
 [E] group kernel-src
 
-[O] vanilla_ver="2.4.21"
-[O] var_append patchfiles " " "patch-2.4.21-ben2.bz2"
+[O] vanilla_ver="2.4.22"
+[O] var_append patchfiles " " "patch-2.4.22-ben2.bz2"
 
 [L] GPL
 [S] Stable
-[V] 2.4.21-benh2
+[V] 2.4.22-benh2
 [P] X -1---5---9 106.000
 [R] + powerpc
 

package/powerpc/linux24benh/arch-ppc-horizon-name-clash.patch

@@ -0,0 +1,11 @@
+--- ./drivers/atm/horizon.c.orig	2003-09-04 20:22:19.000000000 +0200
++++ ./drivers/atm/horizon.c	2003-09-04 20:24:36.000000000 +0200
+@@ -481,7 +481,7 @@
+   return;
+ }
+ 
+-static inline void dump_regs (hrz_dev * dev) {
++static inline void dump_horizon_regs (hrz_dev * dev) {
+ #ifdef DEBUG_HORIZON
+   PRINTD (DBG_REGS, "CONTROL 0: %#x", rd_regl (dev, CONTROL_0_REG));
+   PRINTD (DBG_REGS, "RX CONFIG: %#x", rd_regw (dev, RX_CONFIG_OFF));

package/powerpc/linux24benh/linux24benh.desc

@@ -37,13 +37,13 @@
 
 [L] GPL
 [S] Stable
-[V] 2.4.21-benh2
+[V] 2.4.22-benh2
 [P] X -1---5---9 108.000
 [R] + powerpc
 
-[O] vanilla_ver="2.4.21"
-[O] var_append patchfiles " " "patch-2.4.21-ben2.bz2"
+[O] vanilla_ver="2.4.22"
+[O] var_append patchfiles " " "patch-2.4.22-ben2.bz2"
 
-[D] 4044266806 linux-2.4.21.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.4/
-[D] 2875783741 patch-2.4.21-ben2.bz2 ftp://ftp.kernel.org/pub/linux/kernel/people/benh/
+[D] 0 linux-2.4.22.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.4/
+[D] 0 patch-2.4.22-ben2.bz2 ftp://ftp.kernel.org/pub/linux/kernel/people/benh/