diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 10:25:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 10:25:38 -0800 |
| commit | 64106104dd2d4a6280777e88c1cbf9f7a52c30bd (patch) | |
| tree | 082ed0f5e8be5390e867e4078e6813c509c5e642 /drivers/ieee1394/nodemgr.h | |
| parent | beda9f3a13bbb22cde92a45f230a02ef2afef6a9 (diff) | |
| parent | 91efa462054d44ae52b0c6c8325ed5e899f2cd17 (diff) | |
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
Diffstat (limited to 'drivers/ieee1394/nodemgr.h')
| -rw-r--r-- | drivers/ieee1394/nodemgr.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/ieee1394/nodemgr.h b/drivers/ieee1394/nodemgr.h index e25cbadb8be..4147303ad44 100644 --- a/drivers/ieee1394/nodemgr.h +++ b/drivers/ieee1394/nodemgr.h @@ -70,7 +70,6 @@ struct unit_directory { quadlet_t vendor_id; struct csr1212_keyval *vendor_name_kv; - const char *vendor_oui; quadlet_t model_id; struct csr1212_keyval *model_name_kv; @@ -93,7 +92,6 @@ struct unit_directory { struct node_entry { u64 guid; /* GUID of this node */ u32 guid_vendor_id; /* Top 24bits of guid */ - const char *guid_vendor_oui; /* OUI name of guid vendor id */ struct hpsb_host *host; /* Host this node is attached to */ nodeid_t nodeid; /* NodeID */ @@ -104,7 +102,6 @@ struct node_entry { /* The following is read from the config rom */ u32 vendor_id; struct csr1212_keyval *vendor_name_kv; - const char *vendor_oui; u32 capabilities; |