From d395a1774f34600d72f7d3796716f350ef29584b Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 2 Jan 2007 22:56:57 +0100 Subject: the scheduled IEEE1394_EXPORT_FULL_API removal This patch contains the scheduled IEEE1394_EXPORT_FULL_API removal. Signed-off-by: Adrian Bunk Update: Pull proper portion of feature-removal-schedule.txt. Signed-off-by: Stefan Richter --- drivers/ieee1394/Kconfig | 7 ------- drivers/ieee1394/ieee1394_core.c | 22 ---------------------- 2 files changed, 29 deletions(-) (limited to 'drivers/ieee1394') diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig index e7d56573fe56..3cb8b422b3bd 100644 --- a/drivers/ieee1394/Kconfig +++ b/drivers/ieee1394/Kconfig @@ -66,13 +66,6 @@ config IEEE1394_CONFIG_ROM_IP1394 with MacOSX and WinXP IP-over-1394), enable this option and the eth1394 option below. -config IEEE1394_EXPORT_FULL_API - bool "Export all symbols of ieee1394's API (deprecated)" - depends on IEEE1394 - default n - help - This option will be removed soon. Don't worry, say N. - comment "Device Drivers" depends on IEEE1394 diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c index 9a48ca20d1fd..35fbe4755a2b 100644 --- a/drivers/ieee1394/ieee1394_core.c +++ b/drivers/ieee1394/ieee1394_core.c @@ -1195,10 +1195,6 @@ EXPORT_SYMBOL(hpsb_selfid_complete); EXPORT_SYMBOL(hpsb_packet_sent); EXPORT_SYMBOL(hpsb_packet_received); EXPORT_SYMBOL_GPL(hpsb_disable_irm); -#ifdef CONFIG_IEEE1394_EXPORT_FULL_API -EXPORT_SYMBOL(hpsb_send_phy_config); -EXPORT_SYMBOL(hpsb_send_packet_and_wait); -#endif /** ieee1394_transactions.c **/ EXPORT_SYMBOL(hpsb_get_tlabel); @@ -1229,20 +1225,12 @@ EXPORT_SYMBOL(hpsb_set_hostinfo_key); EXPORT_SYMBOL(hpsb_get_hostinfo_bykey); EXPORT_SYMBOL(hpsb_set_hostinfo); EXPORT_SYMBOL(highlevel_host_reset); -#ifdef CONFIG_IEEE1394_EXPORT_FULL_API -EXPORT_SYMBOL(highlevel_add_host); -EXPORT_SYMBOL(highlevel_remove_host); -#endif /** nodemgr.c **/ EXPORT_SYMBOL(hpsb_node_fill_packet); EXPORT_SYMBOL(hpsb_node_write); EXPORT_SYMBOL(__hpsb_register_protocol); EXPORT_SYMBOL(hpsb_unregister_protocol); -#ifdef CONFIG_IEEE1394_EXPORT_FULL_API -EXPORT_SYMBOL(ieee1394_bus_type); -EXPORT_SYMBOL(nodemgr_for_each_host); -#endif /** csr.c **/ EXPORT_SYMBOL(hpsb_update_config_rom); @@ -1287,13 +1275,3 @@ EXPORT_SYMBOL(csr1212_read); EXPORT_SYMBOL(csr1212_parse_keyval); EXPORT_SYMBOL(_csr1212_read_keyval); EXPORT_SYMBOL(_csr1212_destroy_keyval); -#ifdef CONFIG_IEEE1394_EXPORT_FULL_API -EXPORT_SYMBOL(csr1212_create_csr); -EXPORT_SYMBOL(csr1212_init_local_csr); -EXPORT_SYMBOL(csr1212_new_immediate); -EXPORT_SYMBOL(csr1212_associate_keyval); -EXPORT_SYMBOL(csr1212_new_string_descriptor_leaf); -EXPORT_SYMBOL(csr1212_destroy_csr); -EXPORT_SYMBOL(csr1212_generate_csr_image); -EXPORT_SYMBOL(csr1212_parse_csr); -#endif -- cgit v1.2.3