r4262 - in dists/sid/linux-2.6/debian: . arch/powerpc patches-debian patches-debian/series

[Sven Luther]

Author: luther
Date: 2005-09-23 07:38:34 +0000 (Fri, 23 Sep 2005)
New Revision: 4262

Added:
   dists/sid/linux-2.6/debian/patches-debian/powerpc-ppc64-adbhid.patch
   dists/sid/linux-2.6/debian/patches-debian/series/2.6.12-8
Modified:
   dists/sid/linux-2.6/debian/arch/powerpc/config.powerpc64
   dists/sid/linux-2.6/debian/changelog
Log:
Disabled adbhid on powerpc64 flavour.
added patch to fix the build of adbhid, even though it just exitst.


Modified: dists/sid/linux-2.6/debian/arch/powerpc/config.powerpc64
===================================================================
--- dists/sid/linux-2.6/debian/arch/powerpc/config.powerpc64	2005-09-22 18:51:26 UTC (rev 4261)
+++ dists/sid/linux-2.6/debian/arch/powerpc/config.powerpc64	2005-09-23 07:38:34 UTC (rev 4262)
@@ -61,3 +61,4 @@
 CONFIG_SYSVIPC_COMPAT=y
 CONFIG_THERM_PM72=y
 CONFIG_U3_DART=y
+# CONFIG_INPUT_ADBHID is not set

Modified: dists/sid/linux-2.6/debian/changelog
===================================================================
--- dists/sid/linux-2.6/debian/changelog	2005-09-22 18:51:26 UTC (rev 4261)
+++ dists/sid/linux-2.6/debian/changelog	2005-09-23 07:38:34 UTC (rev 4262)
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.12-8) UNRELEASED; urgency=low
+
+  [ Sven Luther ]
+  * [powerpc] Don't build CONFIG_INPUT_ADBHID on powerp64, as it breaks.  
+
+ -- Sven Luther <luther at debian.org>  Fri, 23 Sep 2005 09:07:49 +0200
+
 linux-2.6 (2.6.12-7) unstable; urgency=high
 
   [ Simon Horman ]

Added: dists/sid/linux-2.6/debian/patches-debian/powerpc-ppc64-adbhid.patch
===================================================================
--- dists/sid/linux-2.6/debian/patches-debian/powerpc-ppc64-adbhid.patch	2005-09-22 18:51:26 UTC (rev 4261)
+++ dists/sid/linux-2.6/debian/patches-debian/powerpc-ppc64-adbhid.patch	2005-09-23 07:38:34 UTC (rev 4262)
@@ -0,0 +1,18 @@
+# 
+# PowerPC 64bit adbhid disabling patch
+# Author: Sven Luther <luther at debian.org>
+# Upstream status: just disabling the non-building driver, a real fix may go upstream nextly.
+#
+
+--- linux-2.6.12/drivers/macintosh/adbhid.c.orig	2005-09-23 07:25:51.000000000 +0000
++++ linux-2.6.12/drivers/macintosh/adbhid.c	2005-09-23 07:28:53.000000000 +0000
+@@ -1196,7 +1196,9 @@
+ static int __init adbhid_init(void)
+ {
+ #ifndef CONFIG_MAC
++#ifndef PPC_PMAC64
+ 	if ( (_machine != _MACH_chrp) && (_machine != _MACH_Pmac) )
++#endif
+ 	    return 0;
+ #endif
+ 

Added: dists/sid/linux-2.6/debian/patches-debian/series/2.6.12-8
===================================================================
--- dists/sid/linux-2.6/debian/patches-debian/series/2.6.12-8	2005-09-22 18:51:26 UTC (rev 4261)
+++ dists/sid/linux-2.6/debian/patches-debian/series/2.6.12-8	2005-09-23 07:38:34 UTC (rev 4262)
@@ -0,0 +1 @@
++ powerpc-ppc64-adbhid.patch