diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-05-29 18:05:05 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-05-29 18:05:05 +0400 |
| commit | 6715930654e06c4d2e66e718ea159079f71838f4 (patch) | |
| tree | 6a0a19fb62f3e99cb5f6bf6c34ae541f7c30fb42 /drivers/net/tokenring/3c359.h | |
| parent | ea3f01f8afd3bc5daff915cc4ea5cc5ea9e7d427 (diff) | |
| parent | e490517a039a99d692cb3a5561941b0a5f576172 (diff) | |
| download | linux-6715930654e06c4d2e66e718ea159079f71838f4.tar.xz | |
Merge commit 'linus/master' into sched-fixes-for-linus
Diffstat (limited to 'drivers/net/tokenring/3c359.h')
| -rw-r--r-- | drivers/net/tokenring/3c359.h | 2 |
1 files changed, 1 insertions, 1 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 { u16 asb; u8 __iomem *xl_mmio; - char *xl_card_name; + const char *xl_card_name; struct pci_dev *pdev ; spinlock_t xl_lock ; |