diff options
author | David S. Miller <davem@davemloft.net> | 2008-05-25 23:26:10 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-05-25 23:26:10 -0700 |
commit | 43154d08d6bb5c69aa0d0e3448fb348b4cd84e91 (patch) | |
tree | 176edb26aad2d33e8be36530b66b19d0603c4b1d /drivers/net/tokenring/3c359.h | |
parent | 03194379a77b02df3404ec4848a50c6784e9a8a5 (diff) | |
parent | 289c79a4bd350e8a25065102563ad1a183d1b402 (diff) | |
download | kernel_samsung_smdk4412-43154d08d6bb5c69aa0d0e3448fb348b4cd84e91.zip kernel_samsung_smdk4412-43154d08d6bb5c69aa0d0e3448fb348b4cd84e91.tar.gz kernel_samsung_smdk4412-43154d08d6bb5c69aa0d0e3448fb348b4cd84e91.tar.bz2 |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/cpmac.c
net/mac80211/mlme.c
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 0f8b4ec..66b1ff6 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 ; |