byteorder: fix direct byteswap includes

PATCH In review Harvey Harrison 1 participant 1 message Aug 19, 2008 Media (V4L/DVB)

lore

Share & tools

lore

Harvey Harrison

author

2008-08-19 00:56 UTC #0 lore raw

PATCH 21/23 byteorder: fix direct byteswap includes

Signed-off-by Harvey Harrison <[email protected]>

---
 arch/avr32/mach-at32ap/include/mach/io.h |    3 +--
 drivers/media/dvb/ttpci/av7110.c         |    2 +-
 drivers/media/video/cx18/cx18-driver.h   |    2 +-
 drivers/media/video/ivtv/ivtv-driver.h   |    2 +-
 drivers/media/video/vpx3220.c            |    2 +-
 kernel/rcupreempt.c                      |    2 +-
 tests/rcutorture.c                       |    2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

arch/avr32/mach-at32ap/include/mach/io.h +1 -2

index 4ec6abc..22ea79b 100644
@@ -1,8 +1,7 @@
 #ifndef __ASM_AVR32_ARCH_AT32AP_IO_H
 #define __ASM_AVR32_ARCH_AT32AP_IO_H
 
-/* For "bizarre" halfword swapping */
-#include <linux/byteorder/swabb.h>
+#include <linux/swab.h>
 
 #if defined(CONFIG_AP700X_32_BIT_SMC)
 # define __swizzle_addr_b(addr)	(addr ^ 3UL)

drivers/media/dvb/ttpci/av7110.c +1 -1

index 25a1e39..351dea5 100644
@@ -36,7 +36,6 @@
 #include <linux/fs.h>
 #include <linux/timer.h>
 #include <linux/poll.h>
-#include <linux/byteorder/swabb.h>
 #include <linux/smp_lock.h>
 
 #include <linux/kernel.h>

@@ -53,6 +52,7 @@
 #include <linux/kthread.h>
 #include <asm/unaligned.h>
 
+#include <asm/byteorder.h>
 #include <asm/system.h>
 
 #include <linux/dvb/frontend.h>

drivers/media/video/cx18/cx18-driver.h +1 -1

index 4801bc7..928388d 100644
@@ -38,10 +38,10 @@
 #include <linux/i2c-algo-bit.h>
 #include <linux/list.h>
 #include <linux/unistd.h>
-#include <linux/byteorder/swab.h>
 #include <linux/pagemap.h>
 #include <linux/workqueue.h>
 #include <linux/mutex.h>
+#include <asm/byteorder.h>
 
 #include <linux/dvb/video.h>
 #include <linux/dvb/audio.h>

drivers/media/video/ivtv/ivtv-driver.h +1 -1

index ab287b4..966c74d 100644
@@ -49,11 +49,11 @@
 #include <linux/i2c-algo-bit.h>
 #include <linux/list.h>
 #include <linux/unistd.h>
-#include <linux/byteorder/swab.h>
 #include <linux/pagemap.h>
 #include <linux/scatterlist.h>
 #include <linux/workqueue.h>
 #include <linux/mutex.h>
+#include <asm/byteorder.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>

drivers/media/video/vpx3220.c +1 -1

index 3529302..5920a9e 100644
@@ -24,7 +24,7 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 
-#include <linux/byteorder/swab.h>
+#include <asm/byteorder.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>

kernel/rcupreempt.c +1 -1

index 2782793..f0289b9 100644
@@ -54,9 +54,9 @@
 #include <linux/cpu.h>
 #include <linux/random.h>
 #include <linux/delay.h>
-#include <linux/byteorder/swabb.h>
 #include <linux/cpumask.h>
 #include <linux/rcupreempt_trace.h>
+#include <asm/byteorder.h>
 
 /*
  * Macro that prevents the compiler from reordering accesses, but does

tests/rcutorture.c +1 -1

index 90b5b12..85cb905 100644
@@ -42,10 +42,10 @@
 #include <linux/freezer.h>
 #include <linux/cpu.h>
 #include <linux/delay.h>
-#include <linux/byteorder/swabb.h>
 #include <linux/stat.h>
 #include <linux/srcu.h>
 #include <linux/slab.h>
+#include <asm/byteorder.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Paul E. McKenney <[email protected]> and "

Signature · 1 line

1.6.0.274.g8aacc