]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
drivers/net/tokenring/olympic.c: fix warning
authorAndrew Morton <akpm@linux-foundation.org>
Wed, 14 May 2008 23:20:15 +0000 (16:20 -0700)
committerJeff Garzik <jgarzik@redhat.com>
Thu, 22 May 2008 10:03:30 +0000 (06:03 -0400)
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 <jeff@garzik.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/tokenring/olympic.h

index c91956310fb2d358230edb3069f3ae81cafb66cf..10fbba08978f4592666d92c6f4f55369589de825 100644 (file)
@@ -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 ;