diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /drivers/net/greth.h | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/net/greth.h')
| -rw-r--r-- | drivers/net/greth.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/greth.h b/drivers/net/greth.h index 973388d6abca..03ad903cd676 100644 --- a/drivers/net/greth.h +++ b/drivers/net/greth.h | |||
| @@ -118,7 +118,7 @@ struct greth_private { | |||
| 118 | 118 | ||
| 119 | int irq; | 119 | int irq; |
| 120 | 120 | ||
| 121 | struct device *dev; /* Pointer to of_device->dev */ | 121 | struct device *dev; /* Pointer to platform_device->dev */ |
| 122 | struct net_device *netdev; | 122 | struct net_device *netdev; |
| 123 | struct napi_struct napi; | 123 | struct napi_struct napi; |
| 124 | spinlock_t devlock; | 124 | spinlock_t devlock; |