On 2 Jan, Adrian Bunk wrote:
> This patch contains the scheduled IEEE1394_OUI_DB removal.
>
> Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
>
> ---
>
> Documentation/feature-removal-schedule.txt | 8
> drivers/ieee1394/Kconfig | 14
> drivers/ieee1394/Makefile | 10
> drivers/ieee1394/nodemgr.c | 39
> drivers/ieee1394/oui.db | 7048 ---------------------
> drivers/ieee1394/oui2c.sh | 22
> 6 files changed, 7141 deletions(-)
...
Committed to linux1394-2.6.git with the following additional hunks:
Index: linux/drivers/ieee1394/.gitignore
===================================================================
--- linux.orig/drivers/ieee1394/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-oui.c
Index: linux/drivers/ieee1394/nodemgr.h
===================================================================
--- linux.orig/drivers/ieee1394/nodemgr.h
+++ linux/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;
Resulting diffstat according to git:
Documentation/feature-removal-schedule.txt | 8
drivers/ieee1394/.gitignore | 1
drivers/ieee1394/Kconfig | 14
drivers/ieee1394/Makefile | 10
drivers/ieee1394/nodemgr.c | 39
drivers/ieee1394/nodemgr.h | 3
drivers/ieee1394/oui.db | 7048 ----------------------------
drivers/ieee1394/oui2c.sh | 22
8 files changed, 0 insertions(+), 7145 deletions(-)
delete mode 100644 drivers/ieee1394/.gitignore
delete mode 100644 drivers/ieee1394/oui.db
delete mode 100644 drivers/ieee1394/oui2c.sh
--
Stefan Richter
-=====-=-=== ---= ---==
http://arcgraph.de/sr/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
