aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <[email protected]>2008-05-14 16:20:15 -0700
committerJeff Garzik <[email protected]>2008-05-22 06:03:30 -0400
commit63dac8ff1b3709b5f7ba71283eb48b4e1f18d563 (patch)
tree5869a7e9331c22c235279c3ad9845475ad79a9c9
parent5d9bac8ece5e2a64a2a450c7e2d6901ed9152052 (diff)
drivers/net/tokenring/olympic.c: fix warning
When dev_name() is changed to return `const char *': drivers/net/tokenring/olympic.c: In function 'olympic_probe': drivers/net/tokenring/olympic.c:234: warning: assignment discards qualifiers from pointer target type Cc: Jeff Garzik <[email protected]> Cc: Greg KH <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
-rw-r--r--drivers/net/tokenring/olympic.h2
1 files changed, 1 insertions, 1 deletions
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 {
u8 __iomem *olympic_mmio;
u8 __iomem *olympic_lap;
struct pci_dev *pdev ;
- char *olympic_card_name ;
+ const char *olympic_card_name;
spinlock_t olympic_lock ;