diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/ieee1394/ieee1394_hotplug.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/ieee1394/ieee1394_hotplug.h')
| -rw-r--r-- | drivers/ieee1394/ieee1394_hotplug.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/ieee1394/ieee1394_hotplug.h b/drivers/ieee1394/ieee1394_hotplug.h deleted file mode 100644 index dd5500ed8322..000000000000 --- a/drivers/ieee1394/ieee1394_hotplug.h +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | #ifndef _IEEE1394_HOTPLUG_H | ||
| 2 | #define _IEEE1394_HOTPLUG_H | ||
| 3 | |||
| 4 | /* Unit spec id and sw version entry for some protocols */ | ||
| 5 | #define AVC_UNIT_SPEC_ID_ENTRY 0x0000A02D | ||
| 6 | #define AVC_SW_VERSION_ENTRY 0x00010001 | ||
| 7 | #define CAMERA_UNIT_SPEC_ID_ENTRY 0x0000A02D | ||
| 8 | #define CAMERA_SW_VERSION_ENTRY 0x00000100 | ||
| 9 | |||
| 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> | ||
| 18 | |||
| 19 | #endif /* _IEEE1394_HOTPLUG_H */ | ||