diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-04-14 07:18:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-04-14 07:19:04 -0400 |
| commit | 6ac1ef482d7ae0c690f1640bf6eb818ff9a2d91e (patch) | |
| tree | 021cc9f6b477146fcebe6f3be4752abfa2ba18a9 /include/linux/sh_eth.h | |
| parent | 682968e0c425c60f0dde37977e5beb2b12ddc4cc (diff) | |
| parent | a385ec4f11bdcf81af094c03e2444ee9b7fad2e5 (diff) | |
Merge branch 'perf/core' into perf/uprobes
Merge in latest upstream (and the latest perf development tree),
to prepare for tooling changes, and also to pick up v3.4 MM
changes that the uprobes code needs to take care of.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/sh_eth.h')
| -rw-r--r-- | include/linux/sh_eth.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sh_eth.h b/include/linux/sh_eth.h index 2076acf8294d..b17d765ded84 100644 --- a/include/linux/sh_eth.h +++ b/include/linux/sh_eth.h | |||
| @@ -20,6 +20,7 @@ struct sh_eth_plat_data { | |||
| 20 | unsigned char mac_addr[6]; | 20 | unsigned char mac_addr[6]; |
| 21 | unsigned no_ether_link:1; | 21 | unsigned no_ether_link:1; |
| 22 | unsigned ether_link_active_low:1; | 22 | unsigned ether_link_active_low:1; |
| 23 | unsigned needs_init:1; | ||
| 23 | }; | 24 | }; |
| 24 | 25 | ||
| 25 | #endif | 26 | #endif |