From e60ce7ae19cfe25092806fd8346146993c0209c7 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Mon, 3 Jul 2006 12:02:30 -0400 Subject: [PATCH] --- yaml --- r: 37263 b: refs/heads/master c: 66faadfac3b8488d27374acaa407e3bd7380131a h: refs/heads/master i: 37261: 1af80a888e168cc12436a6b97e925bc9ce45dfee 37259: 8e1569d6372b56619e7922fd1c13af0b5471a8c7 37255: a3b30d115e759dcc1d78ecd35d12a0a6a0b06145 37247: bf03a47915ead33639d2212f5c33cdef49cfe90c v: v3 --- [refs] | 2 +- trunk/drivers/ieee1394/ieee1394_hotplug.h | 29 +++++++---------------- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/[refs] b/[refs] index a525bd732e96..0f0f85bca983 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de4394f13cc843fae2a3ba2df752ee20e6e779a8 +refs/heads/master: 66faadfac3b8488d27374acaa407e3bd7380131a diff --git a/trunk/drivers/ieee1394/ieee1394_hotplug.h b/trunk/drivers/ieee1394/ieee1394_hotplug.h index 183d93188d48..dd5500ed8322 100644 --- a/trunk/drivers/ieee1394/ieee1394_hotplug.h +++ b/trunk/drivers/ieee1394/ieee1394_hotplug.h @@ -1,32 +1,19 @@ #ifndef _IEEE1394_HOTPLUG_H #define _IEEE1394_HOTPLUG_H -#include -#include - /* Unit spec id and sw version entry for some protocols */ #define AVC_UNIT_SPEC_ID_ENTRY 0x0000A02D #define AVC_SW_VERSION_ENTRY 0x00010001 #define CAMERA_UNIT_SPEC_ID_ENTRY 0x0000A02D #define CAMERA_SW_VERSION_ENTRY 0x00000100 -/* Check to make sure this all isn't already defined */ -#ifndef IEEE1394_MATCH_VENDOR_ID - -#define IEEE1394_MATCH_VENDOR_ID 0x0001 -#define IEEE1394_MATCH_MODEL_ID 0x0002 -#define IEEE1394_MATCH_SPECIFIER_ID 0x0004 -#define IEEE1394_MATCH_VERSION 0x0008 - -struct ieee1394_device_id { - u32 match_flags; - u32 vendor_id; - u32 model_id; - u32 specifier_id; - u32 version; - void *driver_data; -}; - -#endif +/* /include/linux/mod_devicetable.h defines: + * IEEE1394_MATCH_VENDOR_ID + * IEEE1394_MATCH_MODEL_ID + * IEEE1394_MATCH_SPECIFIER_ID + * IEEE1394_MATCH_VERSION + * struct ieee1394_device_id + */ +#include #endif /* _IEEE1394_HOTPLUG_H */