r1659 - in linux-kernel-headers/trunk/debian: . patches
Author: schizo
Date: 2006-06-18 22:16:15 +0000 (Sun, 18 Jun 2006)
New Revision: 1659
Added:
linux-kernel-headers/trunk/debian/patches/linux-input-input_device.patch
Modified:
linux-kernel-headers/trunk/debian/changelog
linux-kernel-headers/trunk/debian/copyright
linux-kernel-headers/trunk/debian/generate-asm.sh
linux-kernel-headers/trunk/debian/patches/byteorder-const.patch
linux-kernel-headers/trunk/debian/patches/series
Log:
* Fix for byteorder-const.patch on arm from Martin Michlmayr.
Modified: linux-kernel-headers/trunk/debian/changelog
===================================================================
--- linux-kernel-headers/trunk/debian/changelog 2006-06-18 16:21:12 UTC (rev 1658)
+++ linux-kernel-headers/trunk/debian/changelog 2006-06-18 22:16:15 UTC (rev 1659)
@@ -1,3 +1,19 @@
+linux-kernel-headers (2.6.16.20-6) unstable; urgency=low
+
+ * Fix for byteorder-const.patch on arm from Martin Michlmayr.
+
+ -- Clint Adams <schizo@debian.org> Sun, 18 Jun 2006 18:09:04 -0400
+
+linux-kernel-headers (2.6.16.20-5) unstable; urgency=low
+
+ * debian/generate-asm.sh: add spaces to work around a bug
+ in dash. closes: #372706.
+ * Update FSF address in debian/copyright.
+ * Guard input_device_id with __KERNEL__. Patch from Alex Romosan.
+ closes: #372762.
+
+ -- Clint Adams <schizo@debian.org> Sun, 11 Jun 2006 12:23:06 -0400
+
linux-kernel-headers (2.6.16.20-4) unstable; urgency=low
* debian/generate-asm.sh: remove all vestigial powerpc stuff
Modified: linux-kernel-headers/trunk/debian/copyright
===================================================================
--- linux-kernel-headers/trunk/debian/copyright 2006-06-18 16:21:12 UTC (rev 1658)
+++ linux-kernel-headers/trunk/debian/copyright 2006-06-18 22:16:15 UTC (rev 1659)
@@ -20,7 +20,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
Modified: linux-kernel-headers/trunk/debian/generate-asm.sh
===================================================================
--- linux-kernel-headers/trunk/debian/generate-asm.sh 2006-06-18 16:21:12 UTC (rev 1658)
+++ linux-kernel-headers/trunk/debian/generate-asm.sh 2006-06-18 22:16:15 UTC (rev 1659)
@@ -55,8 +55,8 @@
cp -a $dir_in/$asm_dir $dir_out/$asm_dir_out
cp -a $dir_in/$asm_dir_biarch $dir_out/$asm_dir_biarch
-dirs=$((( cd "$dir_in/$asm_dir"; find . -type d ); ( cd "$dir_in/$asm_dir_biarch"; find . -type d )) | sort -u )
-files=$((( cd "$dir_in/$asm_dir"; find . -name "*.h" -type f ); ( cd "$dir_in/$asm_dir_biarch"; find . -name "*.h" -type f )) | sed 's/^.\///g' | sort -u )
+dirs=$( (( cd "$dir_in/$asm_dir"; find . -type d ); ( cd "$dir_in/$asm_dir_biarch"; find . -type d )) | sort -u )
+files=$( (( cd "$dir_in/$asm_dir"; find . -name "*.h" -type f ); ( cd "$dir_in/$asm_dir_biarch"; find . -name "*.h" -type f )) | sed 's/^.\///g' | sort -u )
for h in $dirs; do
mkdir -p "$dir_out/asm/$h"
Modified: linux-kernel-headers/trunk/debian/patches/byteorder-const.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/byteorder-const.patch 2006-06-18 16:21:12 UTC (rev 1658)
+++ linux-kernel-headers/trunk/debian/patches/byteorder-const.patch 2006-06-18 22:16:15 UTC (rev 1659)
@@ -7,8 +7,8 @@
Index: include/asm-alpha/byteorder.h
===================================================================
---- include/asm-alpha/byteorder.h.orig 2006-06-10 15:21:47.000000000 -0400
-+++ include/asm-alpha/byteorder.h 2006-06-10 18:26:17.731398881 -0400
+--- include/asm-alpha/byteorder.h.orig 2006-06-18 18:12:19.000000000 -0400
++++ include/asm-alpha/byteorder.h 2006-06-18 18:12:22.030490840 -0400
@@ -7,7 +7,7 @@
#ifdef __GNUC__
@@ -20,8 +20,8 @@
* Unfortunately, we can't use the 6 instruction sequence
Index: include/asm-m68k/byteorder.h
===================================================================
---- include/asm-m68k/byteorder.h.orig 2006-06-10 15:21:47.000000000 -0400
-+++ include/asm-m68k/byteorder.h 2006-06-10 18:26:17.731398881 -0400
+--- include/asm-m68k/byteorder.h.orig 2006-06-18 18:12:19.000000000 -0400
++++ include/asm-m68k/byteorder.h 2006-06-18 18:12:22.030490840 -0400
@@ -6,7 +6,7 @@
#ifdef __GNUC__
@@ -33,8 +33,8 @@
return val;
Index: include/asm-parisc/byteorder.h
===================================================================
---- include/asm-parisc/byteorder.h.orig 2006-06-10 15:21:46.000000000 -0400
-+++ include/asm-parisc/byteorder.h 2006-06-10 18:26:17.735399284 -0400
+--- include/asm-parisc/byteorder.h.orig 2006-06-18 18:12:18.000000000 -0400
++++ include/asm-parisc/byteorder.h 2006-06-18 18:12:22.030490840 -0400
@@ -6,7 +6,7 @@
#ifdef __GNUC__
@@ -82,8 +82,8 @@
__u32 t2 = ___arch__swab32((__u32) (x >> 32));
Index: include/asm-sh/byteorder.h
===================================================================
---- include/asm-sh/byteorder.h.orig 2006-06-10 15:21:46.000000000 -0400
-+++ include/asm-sh/byteorder.h 2006-06-10 18:26:17.735399284 -0400
+--- include/asm-sh/byteorder.h.orig 2006-06-18 18:12:18.000000000 -0400
++++ include/asm-sh/byteorder.h 2006-06-18 18:12:22.034491317 -0400
@@ -8,7 +8,7 @@
#include <asm/types.h>
#include <linux/compiler.h>
@@ -104,8 +104,8 @@
: "=r" (x)
Index: include/asm-sh64/byteorder.h
===================================================================
---- include/asm-sh64/byteorder.h.orig 2006-06-10 15:21:46.000000000 -0400
-+++ include/asm-sh64/byteorder.h 2006-06-10 18:26:17.735399284 -0400
+--- include/asm-sh64/byteorder.h.orig 2006-06-18 18:12:18.000000000 -0400
++++ include/asm-sh64/byteorder.h 2006-06-18 18:12:22.034491317 -0400
@@ -14,7 +14,7 @@
#include <asm/types.h>
@@ -126,8 +126,8 @@
"shari %0, 48, %0"
Index: include/asm-v850/byteorder.h
===================================================================
---- include/asm-v850/byteorder.h.orig 2006-06-10 15:21:46.000000000 -0400
-+++ include/asm-v850/byteorder.h 2006-06-10 18:26:17.735399284 -0400
+--- include/asm-v850/byteorder.h.orig 2006-06-18 18:12:18.000000000 -0400
++++ include/asm-v850/byteorder.h 2006-06-18 18:12:22.034491317 -0400
@@ -19,14 +19,14 @@
#ifdef __GNUC__
@@ -147,8 +147,8 @@
__asm__ ("bsh %1, %0" : "=r" (res) : "r" (half_word));
Index: include/asm-x86_64/byteorder.h
===================================================================
---- include/asm-x86_64/byteorder.h.orig 2006-06-10 15:21:46.000000000 -0400
-+++ include/asm-x86_64/byteorder.h 2006-06-10 18:26:17.739399686 -0400
+--- include/asm-x86_64/byteorder.h.orig 2006-06-18 18:12:18.000000000 -0400
++++ include/asm-x86_64/byteorder.h 2006-06-18 18:12:22.034491317 -0400
@@ -6,13 +6,13 @@
#ifdef __GNUC__
@@ -167,8 +167,8 @@
return x;
Index: include/linux/byteorder/swab.h
===================================================================
---- include/linux/byteorder/swab.h.orig 2006-06-10 18:26:17.395365057 -0400
-+++ include/linux/byteorder/swab.h 2006-06-10 18:26:17.739399686 -0400
+--- include/linux/byteorder/swab.h.orig 2006-06-18 18:12:21.678448870 -0400
++++ include/linux/byteorder/swab.h 2006-06-18 18:12:22.038491794 -0400
@@ -130,7 +130,7 @@
#endif /* OPTIMIZE */
@@ -198,8 +198,8 @@
__u32 h = x >> 32;
Index: include/asm-cris/arch-v10/byteorder.h
===================================================================
---- include/asm-cris/arch-v10/byteorder.h.orig 2006-06-10 15:21:46.000000000 -0400
-+++ include/asm-cris/arch-v10/byteorder.h 2006-06-10 18:26:17.739399686 -0400
+--- include/asm-cris/arch-v10/byteorder.h.orig 2006-06-18 18:12:18.000000000 -0400
++++ include/asm-cris/arch-v10/byteorder.h 2006-06-18 18:12:22.038491794 -0400
@@ -9,14 +9,14 @@
* them together into ntohl etc.
*/
@@ -219,8 +219,8 @@
Index: include/asm-powerpc/byteorder.h
===================================================================
---- include/asm-powerpc/byteorder.h.orig 2006-06-10 15:21:46.000000000 -0400
-+++ include/asm-powerpc/byteorder.h 2006-06-10 18:26:17.743400089 -0400
+--- include/asm-powerpc/byteorder.h.orig 2006-06-18 18:12:18.000000000 -0400
++++ include/asm-powerpc/byteorder.h 2006-06-18 18:12:22.038491794 -0400
@@ -40,7 +40,7 @@
__asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr));
}
@@ -241,14 +241,23 @@
Index: include/asm-arm/byteorder.h
===================================================================
---- include/asm-arm/byteorder.h.orig 2006-06-10 15:21:46.000000000 -0400
-+++ include/asm-arm/byteorder.h 2006-06-10 18:26:34.469083606 -0400
+--- include/asm-arm/byteorder.h.orig 2006-06-18 18:12:35.000000000 -0400
++++ include/asm-arm/byteorder.h 2006-06-18 18:14:15.983979638 -0400
@@ -18,7 +18,7 @@
#include <linux/compiler.h>
#include <asm/types.h>
-static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
-+static __inline__ __u32 ___arch__swab32(__u32 x)
++static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
{
__u32 t;
+@@ -30,7 +30,7 @@
+ * right thing and not screw it up to different degrees
+ * depending on the gcc version.
+ */
+- asm ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x));
++ __asm__ ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x));
+ }
+ x = (x << 24) | (x >> 8); /* mov r0,r0,ror #8 */
+ t &= ~0x00FF0000; /* bic r1,r1,#0x00FF0000 */
Added: linux-kernel-headers/trunk/debian/patches/linux-input-input_device.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/linux-input-input_device.patch 2006-06-18 16:21:12 UTC (rev 1658)
+++ linux-kernel-headers/trunk/debian/patches/linux-input-input_device.patch 2006-06-18 22:16:15 UTC (rev 1659)
@@ -0,0 +1,20 @@
+Index: linux-kernel-headers-2.6.16.20/include/linux/input.h
+===================================================================
+--- linux-kernel-headers-2.6.16.20.orig/include/linux/input.h 2006-06-11 12:29:37.000000000 -0400
++++ linux-kernel-headers-2.6.16.20/include/linux/input.h 2006-06-11 12:30:02.790260844 -0400
+@@ -796,6 +796,7 @@
+
+ #define FF_MAX 0x7f
+
++#ifdef __KERNEL__
+ struct input_device_id {
+
+ kernel_ulong_t flags;
+@@ -814,6 +815,7 @@
+
+ kernel_ulong_t driver_info;
+ };
++#endif /* __KERNEL__ */
+
+ /*
+ * Structure for hotplug & device<->driver matching.
Modified: linux-kernel-headers/trunk/debian/patches/series
===================================================================
--- linux-kernel-headers/trunk/debian/patches/series 2006-06-18 16:21:12 UTC (rev 1658)
+++ linux-kernel-headers/trunk/debian/patches/series 2006-06-18 22:16:15 UTC (rev 1659)
@@ -32,3 +32,4 @@
usb.patch -p0
videodev2-timeval.patch -p0
asm-powerpc-unaligned.patch
+linux-input-input_device.patch
Reply to: