diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /include/net/ethoc.h | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (diff) | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.c
Diffstat (limited to 'include/net/ethoc.h')
| -rw-r--r-- | include/net/ethoc.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/include/net/ethoc.h b/include/net/ethoc.h new file mode 100644 index 000000000000..96f3789b27bc --- /dev/null +++ b/include/net/ethoc.h | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | /* | ||
| 2 | * linux/include/net/ethoc.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008-2009 Avionic Design GmbH | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | * | ||
| 10 | * Written by Thierry Reding <thierry.reding@avionic-design.de> | ||
| 11 | */ | ||
| 12 | |||
| 13 | #ifndef LINUX_NET_ETHOC_H | ||
| 14 | #define LINUX_NET_ETHOC_H 1 | ||
| 15 | |||
| 16 | struct ethoc_platform_data { | ||
| 17 | u8 hwaddr[IFHWADDRLEN]; | ||
| 18 | s8 phy_id; | ||
| 19 | }; | ||
| 20 | |||
| 21 | #endif /* !LINUX_NET_ETHOC_H */ | ||
| 22 | |||