tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[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>
authored by
Stefan Richter
and committed by
Ben Collins
66faadfa
de4394f1
+8
-21
+8
-21
drivers/ieee1394/ieee1394_hotplug.h
+8
-21
drivers/ieee1394/ieee1394_hotplug.h
···
1
1
#ifndef _IEEE1394_HOTPLUG_H
2
2
#define _IEEE1394_HOTPLUG_H
3
3
4
-
#include <linux/mod_devicetable.h>
5
-
#include <linux/types.h>
6
-
7
4
/* Unit spec id and sw version entry for some protocols */
8
5
#define AVC_UNIT_SPEC_ID_ENTRY 0x0000A02D
9
6
#define AVC_SW_VERSION_ENTRY 0x00010001
10
7
#define CAMERA_UNIT_SPEC_ID_ENTRY 0x0000A02D
11
8
#define CAMERA_SW_VERSION_ENTRY 0x00000100
12
9
13
-
/* Check to make sure this all isn't already defined */
14
-
#ifndef IEEE1394_MATCH_VENDOR_ID
15
-
16
-
#define IEEE1394_MATCH_VENDOR_ID 0x0001
17
-
#define IEEE1394_MATCH_MODEL_ID 0x0002
18
-
#define IEEE1394_MATCH_SPECIFIER_ID 0x0004
19
-
#define IEEE1394_MATCH_VERSION 0x0008
20
-
21
-
struct 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
10
+
/* /include/linux/mod_devicetable.h defines:
11
+
* IEEE1394_MATCH_VENDOR_ID
12
+
* IEEE1394_MATCH_MODEL_ID
13
+
* IEEE1394_MATCH_SPECIFIER_ID
14
+
* IEEE1394_MATCH_VERSION
15
+
* struct ieee1394_device_id
16
+
*/
17
+
#include <linux/mod_devicetable.h>
31
18
32
19
#endif /* _IEEE1394_HOTPLUG_H */