summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-11-10 22:26:27 +0000
committerMichael Krufky <devnull@localhost>2005-11-10 22:26:27 +0000
commit94f97d60313b15a71de552846fef782831befcda (patch)
treeee8b6a5e1fd90685b5feaa7ddb630eebbab157a7
parentb888da68b09af1231078409503338a9808a498d0 (diff)
downloadmediapointer-dvb-s2-94f97d60313b15a71de552846fef782831befcda.tar.gz
mediapointer-dvb-s2-94f97d60313b15a71de552846fef782831befcda.tar.bz2
revert akpm's patch for saa711x Kconfig
- revert akpm's patch, thanks to the previous patch from Dave Jones. Signed-off-by: Michael Krufky <mkrufky@m1k.net>
-rw-r--r--linux/drivers/media/video/em28xx/Kconfig2
-rw-r--r--v4l/ChangeLog8
2 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/video/em28xx/Kconfig b/linux/drivers/media/video/em28xx/Kconfig
index 990e3662d..885fd0170 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 && !PPC64
+ depends on VIDEO_DEV && USB && I2C
select VIDEO_BUF
select VIDEO_TUNER
select VIDEO_TVEEPROM
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 55b3e69af..48bfadb55 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-10 22:24 mkrufky
+
+ * ../linux/drivers/media/video/em28xx/Kconfig:
+ - revert akpm's patch, thanks to the
+ previous patch from Dave Jones.
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-11-10 22:21 mkrufky
* ../linux/drivers/media/video/saa711x.c: