diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-18 09:34:17 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-18 09:34:17 -0700 |
commit | a1e4ee22863d41a6fbb24310d7951836cb6dafe7 (patch) | |
tree | 2425e3d680964a493a2598cd30805053a7be5916 /drivers/staging/benet/fwcmd_types_bmap.h | |
parent | 85bff8857c62ab2bc3ed204de3fcde74781bbdb2 (diff) | |
parent | d0573facf21d1e5cfbc1ddac272b7592722e6c01 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
Staging: benet: remove driver now that it is merged in drivers/net/
Diffstat (limited to 'drivers/staging/benet/fwcmd_types_bmap.h')
-rw-r--r-- | drivers/staging/benet/fwcmd_types_bmap.h | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/staging/benet/fwcmd_types_bmap.h b/drivers/staging/benet/fwcmd_types_bmap.h deleted file mode 100644 index 92217aff3a1..00000000000 --- a/drivers/staging/benet/fwcmd_types_bmap.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2005 - 2008 ServerEngines - * All rights reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. The full GNU General - * Public License is included in this distribution in the file called COPYING. - * - * Contact Information: - * linux-drivers@serverengines.com - * - * ServerEngines - * 209 N. Fair Oaks Ave - * Sunnyvale, CA 94085 - */ -/* - * Autogenerated by srcgen version: 0127 - */ -#ifndef __fwcmd_types_bmap_h__ -#define __fwcmd_types_bmap_h__ - -/* MAC address format */ -struct MAC_ADDRESS_FORMAT { - u16 SizeOfStructure; - u8 MACAddress[6]; -} __packed; - -#endif /* __fwcmd_types_bmap_h__ */ |