2 files changed, 21 insertions, 3 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 28a31c5e2289..afeaf6218ea2 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -196,3 +196,21 @@ Why:	Board specific code doesn't build anymore since ~2.6.0 and no
         users have complained indicating there is no more need for these
         boards.  This should really be considered a last call.
 Who:    Ralf Baechle <ralf@linux-mips.org>
+
+---------------------------
+
+What:   USB driver API moves to EXPORT_SYMBOL_GPL
+When:   Febuary 2008
+Files:  include/linux/usb.h, drivers/usb/core/driver.c
+Why:    The USB subsystem has changed a lot over time, and it has been
+        possible to create userspace USB drivers using usbfs/libusb/gadgetfs
+        that operate as fast as the USB bus allows.  Because of this, the USB
+        subsystem will not be allowing closed source kernel drivers to
+        register with it, after this grace period is over.  If anyone needs
+        any help in converting their closed source drivers over to use the
+        userspace filesystems, please contact the
+        linux-usb-devel@lists.sourceforge.net mailing list, and the developers
+        there will be glad to help you out.
+Who:    Greg Kroah-Hartman <gregkh@suse.de>
+
+---------------------------
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index dce9d987f0fc..c196f3845305 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -378,7 +378,7 @@ const struct usb_device_id *usb_match_id(struct usb_interface *interface,
 
         return NULL;
 }
-EXPORT_SYMBOL(usb_match_id);
+EXPORT_SYMBOL_GPL_FUTURE(usb_match_id);
 
 int usb_device_match(struct device *dev, struct device_driver *drv)
 {
@@ -446,7 +446,7 @@ int usb_register_driver(struct usb_driver *new_driver, struct module *owner)
 
         return retval;
 }
-EXPORT_SYMBOL(usb_register_driver);
+EXPORT_SYMBOL_GPL_FUTURE(usb_register_driver);
 
 /**
  * usb_deregister - unregister a USB driver
@@ -469,4 +469,4 @@ void usb_deregister(struct usb_driver *driver)
 
         usbfs_update_special();
 }
-EXPORT_SYMBOL(usb_deregister);
+EXPORT_SYMBOL_GPL_FUTURE(usb_deregister);