diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-20 09:23:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-20 09:23:28 +0100 |
| commit | 0ce1c383681370964e7f77dd44506aeb3a6ba657 (patch) | |
| tree | 75aa590c636feed7d110c03eddb56cc518fc034c /drivers/net/ibm_newemac/mal.h | |
| parent | 0a2a18b721abc960fbcada406746877d22340a60 (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge commit 'v2.6.29-rc2' into x86/mm
Diffstat (limited to 'drivers/net/ibm_newemac/mal.h')
| -rw-r--r-- | drivers/net/ibm_newemac/mal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ibm_newemac/mal.h b/drivers/net/ibm_newemac/mal.h index 2f0a8736084..9ededfbf072 100644 --- a/drivers/net/ibm_newemac/mal.h +++ b/drivers/net/ibm_newemac/mal.h @@ -214,6 +214,8 @@ struct mal_instance { int index; spinlock_t lock; + struct net_device dummy_dev; + unsigned int features; }; |