Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  ieee1394: fix host device registering when nodemgr disabled
  ieee1394: video1394: DMA fix
  ieee1394: raw1394: prevent unloading of low-level driver
  ieee1394: dv1394: tidy up card removal
  ieee1394: dv1394: fix CardBus card ejection
  ieee1394: sbp2: lower block queue alignment requirement
  ieee1394: sbp2: remove bogus "emulated" host flag
  ieee1394: save one word in struct hpsb_host
  ieee1394: restore config ROM when resuming
  ieee1394: ohci1394: drop pcmcia-cs compatibility code
  ieee1394: nodemgr: check info_length in ROM header earlier
  the scheduled IEEE1394_OUI_DB removal
  the scheduled IEEE1394_EXPORT_FULL_API removal
  ieee1394: sbp2: use a better wildcard for blacklist
  Add PCI class ID for firewire OHCI controllers.
  ieee1394: modified csr1212_key_id_type_map to support lisight

1 files changed, 0 insertions, 21 deletions

diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index e7d56573fe56..b8a47342cd2c 100644
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -35,20 +35,6 @@ config IEEE1394_VERBOSEDEBUG
           Say Y if you really want or need the debugging output, everyone
           else says N.
 
-config IEEE1394_OUI_DB
-        bool "OUI Database built-in (deprecated)"
-        depends on IEEE1394
-        help
-          If you say Y here, then an OUI list (vendor unique ID's) will be
-          compiled into the ieee1394 module. This doesn't really do much
-          except being able to display the vendor of a hardware node. The
-          downside is that it adds about 300k to the size of the module,
-          or kernel (depending on whether you compile ieee1394 as a
-          module, or static in the kernel).
-
-          This option is not needed for userspace programs like gscanbus
-          to show this information.
-
 config IEEE1394_EXTRA_CONFIG_ROMS
         bool "Build in extra config rom entries for certain functionality"
         depends on IEEE1394
@@ -66,13 +52,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