aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2006-07-03 12:02:30 -0400
committerBen Collins <bcollins@ubuntu.com>2006-07-03 12:02:30 -0400
commit66faadfac3b8488d27374acaa407e3bd7380131a (patch)
tree2da7570d595b9190e65252fe5ebaa592ae5b7478
parentde4394f13cc843fae2a3ba2df752ee20e6e779a8 (diff)
[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>
-rw-r--r--drivers/ieee1394/ieee1394_hotplug.h29
1 files changed, 8 insertions, 21 deletions
diff --git a/drivers/ieee1394/ieee1394_hotplug.h b/drivers/ieee1394/ieee1394_hotplug.h
index 183d93188d48..dd5500ed8322 100644
--- a/drivers/ieee1394/ieee1394_hotplug.h
+++ b/drivers/ieee1394/ieee1394_hotplug.h
@@ -1,32 +1,19 @@
1#ifndef _IEEE1394_HOTPLUG_H 1#ifndef _IEEE1394_HOTPLUG_H
2#define _IEEE1394_HOTPLUG_H 2#define _IEEE1394_HOTPLUG_H
3 3
4#include <linux/mod_devicetable.h>
5#include <linux/types.h>
6
7/* Unit spec id and sw version entry for some protocols */ 4/* Unit spec id and sw version entry for some protocols */
8#define AVC_UNIT_SPEC_ID_ENTRY 0x0000A02D 5#define AVC_UNIT_SPEC_ID_ENTRY 0x0000A02D
9#define AVC_SW_VERSION_ENTRY 0x00010001 6#define AVC_SW_VERSION_ENTRY 0x00010001
10#define CAMERA_UNIT_SPEC_ID_ENTRY 0x0000A02D 7#define CAMERA_UNIT_SPEC_ID_ENTRY 0x0000A02D
11#define CAMERA_SW_VERSION_ENTRY 0x00000100 8#define CAMERA_SW_VERSION_ENTRY 0x00000100
12 9
13/* Check to make sure this all isn't already defined */ 10/* /include/linux/mod_devicetable.h defines:
14#ifndef IEEE1394_MATCH_VENDOR_ID 11 * IEEE1394_MATCH_VENDOR_ID
15 12 * IEEE1394_MATCH_MODEL_ID
16#define IEEE1394_MATCH_VENDOR_ID 0x0001 13 * IEEE1394_MATCH_SPECIFIER_ID
17#define IEEE1394_MATCH_MODEL_ID 0x0002 14 * IEEE1394_MATCH_VERSION
18#define IEEE1394_MATCH_SPECIFIER_ID 0x0004 15 * struct ieee1394_device_id
19#define IEEE1394_MATCH_VERSION 0x0008 16 */
20 17#include <linux/mod_devicetable.h>
21struct ieee1394_device_id {
22 u32 match_flags;
23 u32 vendor_id;
24 u32 model_id;
25 u32 specifier_id;
26 u32 version;
27 void *driver_data;
28};
29
30#endif
31 18
32#endif /* _IEEE1394_HOTPLUG_H */ 19#endif /* _IEEE1394_HOTPLUG_H */