diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-10-30 22:16:56 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-30 22:16:56 +0200 |
commit | f1e095f1d206b81b44160f41278ce5c78641e9b7 (patch) | |
tree | bd293d46d2d3e4cdf435a22ddb2877c6ba1b8acc /drivers/ieee1394/ieee1394_hotplug.h | |
parent | telephony: fix return value (diff) | |
parent | Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify (diff) | |
download | linux-dev-f1e095f1d206b81b44160f41278ce5c78641e9b7.tar.xz linux-dev-f1e095f1d206b81b44160f41278ce5c78641e9b7.zip |
Merge branch 'master' into for-next
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 @@ -#ifndef _IEEE1394_HOTPLUG_H -#define _IEEE1394_HOTPLUG_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 - -/* /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 */ |