[kernel] r12154 - in dists/trunk/linux-2.6/debian/patches: bugfix/all series

[Martin Michlmayr]

Author: tbm
Date: Sun Aug 31 08:10:48 2008
New Revision: 12154

Log:
fix some new compile errors


Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/media_swap_compile_fix.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Added: dists/trunk/linux-2.6/debian/patches/bugfix/all/media_swap_compile_fix.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/media_swap_compile_fix.patch	Sun Aug 31 08:10:48 2008
@@ -0,0 +1,67 @@
+From: Martin Michlmayr <tbm at cyrius.com>
+
+Some DVB/media drivers fail to compile with rc5 (but worked in rc4)
+because of conflicting swap declarations.  Including linux/byteorder.h
+rather than more specific headers fixes the compilation errors.
+
+| In file included from drivers/media/dvb/ttpci/av7110.c:39:
+| include/linux/byteorder/swabb.h:98: error: conflicting types for ‘__swahw32p’
+| include/linux/swab.h:200: error: previous definition of ‘__swahw32p’ was here
+...
+
+Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
+
+
+diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
+index 0777e8f..3d042b8 100644
+--- a/drivers/media/dvb/ttpci/av7110.c
++++ b/drivers/media/dvb/ttpci/av7110.c
+@@ -36,7 +36,7 @@
+ #include <linux/fs.h>
+ #include <linux/timer.h>
+ #include <linux/poll.h>
+-#include <linux/byteorder/swabb.h>
++#include <linux/byteorder.h>
+ #include <linux/smp_lock.h>
+ 
+ #include <linux/kernel.h>
+diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
+index 4801bc7..83a9a59 100644
+--- a/drivers/media/video/cx18/cx18-driver.h
++++ b/drivers/media/video/cx18/cx18-driver.h
+@@ -38,7 +38,7 @@
+ #include <linux/i2c-algo-bit.h>
+ #include <linux/list.h>
+ #include <linux/unistd.h>
+-#include <linux/byteorder/swab.h>
++#include <linux/byteorder.h>
+ #include <linux/pagemap.h>
+ #include <linux/workqueue.h>
+ #include <linux/mutex.h>
+diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
+index ab287b4..0cf23a8 100644
+--- a/drivers/media/video/ivtv/ivtv-driver.h
++++ b/drivers/media/video/ivtv/ivtv-driver.h
+@@ -49,7 +49,7 @@
+ #include <linux/i2c-algo-bit.h>
+ #include <linux/list.h>
+ #include <linux/unistd.h>
+-#include <linux/byteorder/swab.h>
++#include <linux/byteorder.h>
+ #include <linux/pagemap.h>
+ #include <linux/scatterlist.h>
+ #include <linux/workqueue.h>
+diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
+index 3529302..567d7a8 100644
+--- a/drivers/media/video/vpx3220.c
++++ b/drivers/media/video/vpx3220.c
+@@ -24,7 +24,7 @@
+ #include <linux/types.h>
+ #include <linux/slab.h>
+ 
+-#include <linux/byteorder/swab.h>
++#include <linux/byteorder.h>
+ 
+ #include <asm/io.h>
+ #include <asm/uaccess.h>
+

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	Sun Aug 31 08:10:48 2008
@@ -29,3 +29,4 @@
 + bugfix/fix-hifn_795X-divdi3.patch
 + bugfix/powerpc/mm-mol.patch
 #+ bugfix/powerpc/lpar-console.patch
++ bugfix/all/media_swap_compile_fix.patch