diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-11-24 14:19:09 -0500 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-12-07 17:12:02 -0500 |
commit | 3015c7397876f5c5de0e178e2dfe22859b5d8754 (patch) | |
tree | c76b58eb466af9e658f4b0b0cba689c565968825 | |
parent | ed30c26ee809b060f437fd9f1b3453e1d0375e32 (diff) |
ieee1394: conditionally export ieee1394_bus_type
Follow-up to patch "Consolidate driver registering":
Since I plan the lifetime of Linux 2.6.20 to be the deprecation phase
of CONFIG_IEEE1394_EXPORT_FULL_API, it seems fair to keep all previously
exported symbols available with this option until this phase is over.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 3 | ||||
-rw-r--r-- | drivers/ieee1394/ieee1394_core.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 3d5ffd0041bd..46f2a559b27c 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -52,7 +52,8 @@ Who: Dan Dennedy <dan@dennedy.org>, Stefan Richter <stefanr@s5r6.in-berlin.de> | |||
52 | 52 | ||
53 | What: ieee1394 core's unused exports (CONFIG_IEEE1394_EXPORT_FULL_API) | 53 | What: ieee1394 core's unused exports (CONFIG_IEEE1394_EXPORT_FULL_API) |
54 | When: January 2007 | 54 | When: January 2007 |
55 | Why: There are no projects known to use these exported symbols. | 55 | Why: There are no projects known to use these exported symbols, except |
56 | dfg1394 (uses one symbol whose functionality is core-internal now). | ||
56 | Who: Stefan Richter <stefanr@s5r6.in-berlin.de> | 57 | Who: Stefan Richter <stefanr@s5r6.in-berlin.de> |
57 | 58 | ||
58 | --------------------------- | 59 | --------------------------- |
diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c index 7778ab3e8ea4..9a48ca20d1fd 100644 --- a/drivers/ieee1394/ieee1394_core.c +++ b/drivers/ieee1394/ieee1394_core.c | |||
@@ -1240,6 +1240,7 @@ EXPORT_SYMBOL(hpsb_node_write); | |||
1240 | EXPORT_SYMBOL(__hpsb_register_protocol); | 1240 | EXPORT_SYMBOL(__hpsb_register_protocol); |
1241 | EXPORT_SYMBOL(hpsb_unregister_protocol); | 1241 | EXPORT_SYMBOL(hpsb_unregister_protocol); |
1242 | #ifdef CONFIG_IEEE1394_EXPORT_FULL_API | 1242 | #ifdef CONFIG_IEEE1394_EXPORT_FULL_API |
1243 | EXPORT_SYMBOL(ieee1394_bus_type); | ||
1243 | EXPORT_SYMBOL(nodemgr_for_each_host); | 1244 | EXPORT_SYMBOL(nodemgr_for_each_host); |
1244 | #endif | 1245 | #endif |
1245 | 1246 | ||