summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/em28xx/Kconfig2
-rw-r--r--v4l/ChangeLog13
2 files changed, 14 insertions, 1 deletions
diff --git a/linux/drivers/media/video/em28xx/Kconfig b/linux/drivers/media/video/em28xx/Kconfig
index 885fd0170..990e3662d 100644
--- a/linux/drivers/media/video/em28xx/Kconfig
+++ b/linux/drivers/media/video/em28xx/Kconfig
@@ -1,6 +1,6 @@
config VIDEO_EM28XX
tristate "Empia EM2800/2820/2840 USB video capture support"
- depends on VIDEO_DEV && USB && I2C
+ depends on VIDEO_DEV && USB && I2C && !PPC64
select VIDEO_BUF
select VIDEO_TUNER
select VIDEO_TVEEPROM
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index f17932075..d2ab62d99 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,16 @@
+2005-11-10 17:00 mkrufky
+
+ * ../linux/drivers/media/video/em28xx/Kconfig:
+ - saa711x is busted on ppc64
+ - drivers/media/video/saa711x.c:39:25: asm/segment.h:
+ No such file or directory
+
+ Cc: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+ Cc: Michael Krufky <mkrufky@m1k.net>
+ Cc: Johannes Stezenbach <js@linuxtv.org>
+ Signed-off-by: Andrew Morton <akpm@osdl.org>
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-11-10 16:58 mkrufky
* ../linux/drivers/media/video/saa7134/saa7134-oss.c: