From ebbd5e390a6f582fe9d4f9f23b9671d601f53064 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Sat, 18 Oct 2008 20:28:37 -0700
Subject: [PATCH] --- yaml --- r: 115961 b: refs/heads/master c:
 1a651a00e20fd4997f0b91258f6f95b7d96edcd9 h: refs/heads/master i:   115959:
 520fbbf4f8a14f2fa76662db2d3a3d47aac7b7a9 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/media/dvb/ttpci/av7110.c       | 2 +-
 trunk/drivers/media/video/cx18/cx18-driver.h | 1 +
 trunk/drivers/media/video/ivtv/ivtv-driver.h | 1 +
 trunk/kernel/rcupreempt.c                    | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b4ca6292ef62..ca533c03e935 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d8cca44b6a244b7e378546d719041819049a0f9
+refs/heads/master: 1a651a00e20fd4997f0b91258f6f95b7d96edcd9
diff --git a/trunk/drivers/media/dvb/ttpci/av7110.c b/trunk/drivers/media/dvb/ttpci/av7110.c
index c7c770c28988..aa1ff524256e 100644
--- a/trunk/drivers/media/dvb/ttpci/av7110.c
+++ b/trunk/drivers/media/dvb/ttpci/av7110.c
@@ -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>
@@ -52,6 +51,7 @@
 #include <linux/i2c.h>
 #include <linux/kthread.h>
 #include <asm/unaligned.h>
+#include <asm/byteorder.h>
 
 #include <asm/system.h>
 
diff --git a/trunk/drivers/media/video/cx18/cx18-driver.h b/trunk/drivers/media/video/cx18/cx18-driver.h
index fa8be0731a3f..a4b1708fafe7 100644
--- a/trunk/drivers/media/video/cx18/cx18-driver.h
+++ b/trunk/drivers/media/video/cx18/cx18-driver.h
@@ -41,6 +41,7 @@
 #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>
diff --git a/trunk/drivers/media/video/ivtv/ivtv-driver.h b/trunk/drivers/media/video/ivtv/ivtv-driver.h
index bc29436e8a3c..3733b2afec5f 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-driver.h
+++ b/trunk/drivers/media/video/ivtv/ivtv-driver.h
@@ -55,6 +55,7 @@
 #include <linux/mutex.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
+#include <asm/byteorder.h>
 
 #include <linux/dvb/video.h>
 #include <linux/dvb/audio.h>
diff --git a/trunk/kernel/rcupreempt.c b/trunk/kernel/rcupreempt.c
index ca4bbbe04aa4..59236e8b9daa 100644
--- a/trunk/kernel/rcupreempt.c
+++ b/trunk/kernel/rcupreempt.c
@@ -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>
 
 /*
  * PREEMPT_RCU data structures.