[PATCH] ieee1394: remove redundant code from ieee1394_hotplug.h

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Ben Collins <bcollins@ubuntu.com>

diff --git a/drivers/ieee1394/ieee1394_hotplug.h b/drivers/ieee1394/ieee1394_hotplug.h
index 183d931..dd5500e 100644 (file)
--- a/drivers/ieee1394/ieee1394_hotplug.h
+++ b/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 */