diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 16:44:56 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 16:44:56 (GMT) |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/otus/zdusb.h | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | linux-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.xz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/otus/zdusb.h')
-rw-r--r-- | drivers/staging/otus/zdusb.h | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/drivers/staging/otus/zdusb.h b/drivers/staging/otus/zdusb.h deleted file mode 100644 index 97e4ef0..0000000 --- a/drivers/staging/otus/zdusb.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2007-2008 Atheros Communications Inc. - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -/* */ -/* Module Name : zdusb.h */ -/* */ -/* Abstract */ -/* This module contains definitions for USB device driver */ -/* */ -/* NOTES */ -/* Platform dependent. */ -/* */ -/************************************************************************/ - -#ifndef _ZDUSB_H -#define _ZDUSB_H - -#ifndef DRIVER_NAME -#define DRIVER_NAME "arusb" -#endif - -#define VERSIONID "0.0.0.999" - -/* Define these values to match your device */ -#define VENDOR_ATHR 0x0CF3 /* Atheros */ -#define PRODUCT_AR9170 0x9170 - -#define VENDOR_DLINK 0x07D1 /* Dlink */ -#define PRODUCT_DWA160A 0x3C10 - -#define VENDOR_NETGEAR 0x0846 /* NetGear */ -#define PRODUCT_WNDA3100 0x9010 -#define PRODUCT_WN111v2 0x9001 - -#endif |