diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-23 03:05:14 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-23 03:05:14 -0400 |
| commit | 7bece8155be133cd67c41eed2b31c60a310609de (patch) | |
| tree | 906a62dcf10c1f2e6c1188a2b6e386668fcd9fe3 /drivers/net/tokenring | |
| parent | b9a2f2e450b0f770bb4347ae8d48eb2dea701e24 (diff) | |
| parent | bdefff1f54cb76a19700663f211350de2f65cc91 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/tokenring')
| -rw-r--r-- | drivers/net/tokenring/3c359.h | 2 | ||||
| -rw-r--r-- | drivers/net/tokenring/olympic.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tokenring/3c359.h b/drivers/net/tokenring/3c359.h index b880cba0f6fd..74cf8e1a181b 100644 --- a/drivers/net/tokenring/3c359.h +++ b/drivers/net/tokenring/3c359.h | |||
| @@ -264,7 +264,7 @@ struct xl_private { | |||
| 264 | u16 asb; | 264 | u16 asb; |
| 265 | 265 | ||
| 266 | u8 __iomem *xl_mmio; | 266 | u8 __iomem *xl_mmio; |
| 267 | char *xl_card_name; | 267 | const char *xl_card_name; |
| 268 | struct pci_dev *pdev ; | 268 | struct pci_dev *pdev ; |
| 269 | 269 | ||
| 270 | spinlock_t xl_lock ; | 270 | spinlock_t xl_lock ; |
diff --git a/drivers/net/tokenring/olympic.h b/drivers/net/tokenring/olympic.h index c91956310fb2..10fbba08978f 100644 --- a/drivers/net/tokenring/olympic.h +++ b/drivers/net/tokenring/olympic.h | |||
| @@ -254,7 +254,7 @@ struct olympic_private { | |||
| 254 | u8 __iomem *olympic_mmio; | 254 | u8 __iomem *olympic_mmio; |
| 255 | u8 __iomem *olympic_lap; | 255 | u8 __iomem *olympic_lap; |
| 256 | struct pci_dev *pdev ; | 256 | struct pci_dev *pdev ; |
| 257 | char *olympic_card_name ; | 257 | const char *olympic_card_name; |
| 258 | 258 | ||
| 259 | spinlock_t olympic_lock ; | 259 | spinlock_t olympic_lock ; |
| 260 | 260 | ||