r1029 - in linux-kernel-headers/trunk/debian: . patches
Author: dan
Date: 2005-10-13 18:50:11 +0000 (Thu, 13 Oct 2005)
New Revision: 1029
Added:
linux-kernel-headers/trunk/debian/patches/linux-joystick.patch
Modified:
linux-kernel-headers/trunk/debian/changelog
Log:
Merge joystick.h NMU.
Modified: linux-kernel-headers/trunk/debian/changelog
===================================================================
--- linux-kernel-headers/trunk/debian/changelog 2005-08-31 05:17:03 UTC (rev 1028)
+++ linux-kernel-headers/trunk/debian/changelog 2005-10-13 18:50:11 UTC (rev 1029)
@@ -1,3 +1,18 @@
+linux-kernel-headers (2.6.13+0rc3-2) unstable; urgency=low
+
+ * Acknowledge NMU from Adeodato Simó (Closes: #320515). Thanks!
+
+ -- Daniel Jacobowitz <dan@debian.org> Thu, 13 Oct 2005 14:48:15 -0400
+
+linux-kernel-headers (2.6.13+0rc3-1.1) unstable; urgency=low
+
+ * Non-maintainer upload to fix RC bug that makes other packages FTBFS.
+
+ * debian/patches/linux-joystick.patch: New file, wrap the usage of
+ BITS_PER_LONG with #ifdef __KERNEL__. (Closes: #320515)
+
+ -- Adeodato Simó <asp16@alu.ua.es> Sun, 07 Aug 2005 12:57:42 +0200
+
linux-kernel-headers (2.6.13+0rc3-1) unstable; urgency=low
* GOTO Masanori <gotom@debian.org>
Added: linux-kernel-headers/trunk/debian/patches/linux-joystick.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/linux-joystick.patch 2005-08-31 05:17:03 UTC (rev 1028)
+++ linux-kernel-headers/trunk/debian/patches/linux-joystick.patch 2005-10-13 18:50:11 UTC (rev 1029)
@@ -0,0 +1,20 @@
+2005-08-07 adeodato
+Wrap the usage of BITS_PER_LONG with #ifdef __KERNEL__ (#320515)
+
+--- include/linux/joystick.h
++++ include/linux/joystick.h
+@@ -134,6 +134,7 @@
+ struct JS_DATA_TYPE JS_CORR;
+ };
+
++#ifdef __KERNEL__
+ #if BITS_PER_LONG == 64
+ #define JS_DATA_SAVE_TYPE JS_DATA_SAVE_TYPE_64
+ #elif BITS_PER_LONG == 32
+@@ -141,5 +142,6 @@
+ #else
+ #error Unexpected BITS_PER_LONG
+ #endif
++#endif
+
+ #endif /* _LINUX_JOYSTICK_H */
Reply to: