---

yaml --- r: 37263 b: refs/heads/master c: 66faadf h: refs/heads/master i: 37261: 1af80a8 37259: 8e1569d 37255: a3b30d1 37247: bf03a47 v: v3
git-mirror · Jul 3, 2006 · e60ce7a · e60ce7a
1 parent d4c18b0
commit e60ce7a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 22 deletions.
diff --git 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
@@ -1,32 +1,19 @@
 #ifndef _IEEE1394_HOTPLUG_H
 #define _IEEE1394_HOTPLUG_H
 
-#include <linux/mod_devicetable.h>
-#include <linux/types.h>
-
 /* 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 <linux/mod_devicetable.h>
 
 #endif /* _IEEE1394_HOTPLUG_H */