aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/feature-removal-schedule.txt8
-rw-r--r--drivers/ieee1394/Kconfig2
2 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index ed10a464e915..3d5ffd0041bd 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -57,6 +57,14 @@ Who: Stefan Richter <stefanr@s5r6.in-berlin.de>
57 57
58--------------------------- 58---------------------------
59 59
60What: ieee1394's *_oui sysfs attributes (CONFIG_IEEE1394_OUI_DB)
61When: January 2007
62Files: drivers/ieee1394/: oui.db, oui2c.sh
63Why: big size, little value
64Who: Stefan Richter <stefanr@s5r6.in-berlin.de>
65
66---------------------------
67
60What: Video4Linux API 1 ioctls and video_decoder.h from Video devices. 68What: Video4Linux API 1 ioctls and video_decoder.h from Video devices.
61When: December 2006 69When: December 2006
62Why: V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6 70Why: V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6
diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index 87325ddbda56..21a13348f258 100644
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -36,7 +36,7 @@ config IEEE1394_VERBOSEDEBUG
36 else says N. 36 else says N.
37 37
38config IEEE1394_OUI_DB 38config IEEE1394_OUI_DB
39 bool "OUI Database built-in" 39 bool "OUI Database built-in (deprecated)"
40 depends on IEEE1394 40 depends on IEEE1394
41 help 41 help
42 If you say Y here, then an OUI list (vendor unique ID's) will be 42 If you say Y here, then an OUI list (vendor unique ID's) will be