summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/saa711x.c1
-rw-r--r--v4l/ChangeLog10
2 files changed, 10 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa711x.c b/linux/drivers/media/video/saa711x.c
index e59128fc0..071e629ed 100644
--- a/linux/drivers/media/video/saa711x.c
+++ b/linux/drivers/media/video/saa711x.c
@@ -36,7 +36,6 @@
#include <asm/pgtable.h>
#include <asm/page.h>
#include <linux/sched.h>
-#include <asm/segment.h>
#include <linux/types.h>
#include <asm/uaccess.h>
#include "compat.h"
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index d1d885b8a..55b3e69af 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,13 @@
+2005-11-10 22:21 mkrufky
+
+ * ../linux/drivers/media/video/saa711x.c:
+ - removed #include <asm/segment.h>
+ - This breaks compilation on non-x86 architectures,
+ and isn't even used.
+
+ Signed-off-by: Dave Jones <davej@redhat.com>
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-11-10 20:41 nshmyrev
* ../linux/drivers/media/video/compat_ioctl32.c: (native_ioctl):