diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ide/pci/pdc202xx_new.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/au1550nd.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/rtc_from4.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/spia.c | 2 | ||||
-rw-r--r-- | drivers/net/8139too.c | 2 | ||||
-rw-r--r-- | drivers/net/pci-skeleton.c | 2 | ||||
-rw-r--r-- | drivers/net/r8169.c | 2 | ||||
-rw-r--r-- | drivers/net/sis190.c | 2 | ||||
-rw-r--r-- | drivers/usb/atm/speedtch.c | 4 | ||||
-rw-r--r-- | drivers/usb/image/microtek.c | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c index 211641a54398..fe06ebb0e5bf 100644 --- a/drivers/ide/pci/pdc202xx_new.c +++ b/drivers/ide/pci/pdc202xx_new.c | |||
@@ -39,7 +39,7 @@ | |||
39 | 39 | ||
40 | #define PDC202_DEBUG_CABLE 0 | 40 | #define PDC202_DEBUG_CABLE 0 |
41 | 41 | ||
42 | const static char *pdc_quirk_drives[] = { | 42 | static const char *pdc_quirk_drives[] = { |
43 | "QUANTUM FIREBALLlct08 08", | 43 | "QUANTUM FIREBALLlct08 08", |
44 | "QUANTUM FIREBALLP KA6.4", | 44 | "QUANTUM FIREBALLP KA6.4", |
45 | "QUANTUM FIREBALLP KA9.1", | 45 | "QUANTUM FIREBALLP KA9.1", |
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c index 9c5945d6df88..201e1362da14 100644 --- a/drivers/mtd/nand/au1550nd.c +++ b/drivers/mtd/nand/au1550nd.c | |||
@@ -43,7 +43,7 @@ static int nand_width = 1; /* default x8*/ | |||
43 | /* | 43 | /* |
44 | * Define partitions for flash device | 44 | * Define partitions for flash device |
45 | */ | 45 | */ |
46 | const static struct mtd_partition partition_info[] = { | 46 | static const struct mtd_partition partition_info[] = { |
47 | { | 47 | { |
48 | .name = "NAND FS 0", | 48 | .name = "NAND FS 0", |
49 | .offset = 0, | 49 | .offset = 0, |
diff --git a/drivers/mtd/nand/rtc_from4.c b/drivers/mtd/nand/rtc_from4.c index 3a5841c9d950..4129c03dfd90 100644 --- a/drivers/mtd/nand/rtc_from4.c +++ b/drivers/mtd/nand/rtc_from4.c | |||
@@ -96,7 +96,7 @@ static struct mtd_info *rtc_from4_mtd = NULL; | |||
96 | */ | 96 | */ |
97 | static void __iomem *rtc_from4_fio_base = (void *)P2SEGADDR(RTC_FROM4_FIO_BASE); | 97 | static void __iomem *rtc_from4_fio_base = (void *)P2SEGADDR(RTC_FROM4_FIO_BASE); |
98 | 98 | ||
99 | const static struct mtd_partition partition_info[] = { | 99 | static const struct mtd_partition partition_info[] = { |
100 | { | 100 | { |
101 | .name = "Renesas flash partition 1", | 101 | .name = "Renesas flash partition 1", |
102 | .offset = 0, | 102 | .offset = 0, |
diff --git a/drivers/mtd/nand/spia.c b/drivers/mtd/nand/spia.c index 32541cbb0103..9cf1ce718ec1 100644 --- a/drivers/mtd/nand/spia.c +++ b/drivers/mtd/nand/spia.c | |||
@@ -67,7 +67,7 @@ module_param(spia_peddr, int, 0); | |||
67 | /* | 67 | /* |
68 | * Define partitions for flash device | 68 | * Define partitions for flash device |
69 | */ | 69 | */ |
70 | const static struct mtd_partition partition_info[] = { | 70 | static const struct mtd_partition partition_info[] = { |
71 | { | 71 | { |
72 | .name = "SPIA flash partition 1", | 72 | .name = "SPIA flash partition 1", |
73 | .offset = 0, | 73 | .offset = 0, |
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index d2102a27d307..adfba44dac5a 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c | |||
@@ -505,7 +505,7 @@ enum chip_flags { | |||
505 | #define HW_REVID_MASK HW_REVID(1, 1, 1, 1, 1, 1, 1) | 505 | #define HW_REVID_MASK HW_REVID(1, 1, 1, 1, 1, 1, 1) |
506 | 506 | ||
507 | /* directly indexed by chip_t, above */ | 507 | /* directly indexed by chip_t, above */ |
508 | const static struct { | 508 | static const struct { |
509 | const char *name; | 509 | const char *name; |
510 | u32 version; /* from RTL8139C/RTL8139D docs */ | 510 | u32 version; /* from RTL8139C/RTL8139D docs */ |
511 | u32 flags; | 511 | u32 flags; |
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c index a1ac4bd1696e..a7bb54df75a8 100644 --- a/drivers/net/pci-skeleton.c +++ b/drivers/net/pci-skeleton.c | |||
@@ -415,7 +415,7 @@ typedef enum { | |||
415 | 415 | ||
416 | 416 | ||
417 | /* directly indexed by chip_t, above */ | 417 | /* directly indexed by chip_t, above */ |
418 | const static struct { | 418 | static const struct { |
419 | const char *name; | 419 | const char *name; |
420 | u8 version; /* from RTL8139C docs */ | 420 | u8 version; /* from RTL8139C docs */ |
421 | u32 RxConfigMask; /* should clear the bits supported by this chip */ | 421 | u32 RxConfigMask; /* should clear the bits supported by this chip */ |
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 14a76f7cf900..2e1bed153c39 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
@@ -170,7 +170,7 @@ enum phy_version { | |||
170 | #define _R(NAME,MAC,MASK) \ | 170 | #define _R(NAME,MAC,MASK) \ |
171 | { .name = NAME, .mac_version = MAC, .RxConfigMask = MASK } | 171 | { .name = NAME, .mac_version = MAC, .RxConfigMask = MASK } |
172 | 172 | ||
173 | const static struct { | 173 | static const struct { |
174 | const char *name; | 174 | const char *name; |
175 | u8 mac_version; | 175 | u8 mac_version; |
176 | u32 RxConfigMask; /* Clears the bits supported by this chip */ | 176 | u32 RxConfigMask; /* Clears the bits supported by this chip */ |
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index 478791e09bf7..b420182eec4b 100644 --- a/drivers/net/sis190.c +++ b/drivers/net/sis190.c | |||
@@ -329,7 +329,7 @@ static struct mii_chip_info { | |||
329 | { NULL, } | 329 | { NULL, } |
330 | }; | 330 | }; |
331 | 331 | ||
332 | const static struct { | 332 | static const struct { |
333 | const char *name; | 333 | const char *name; |
334 | } sis_chip_info[] = { | 334 | } sis_chip_info[] = { |
335 | { "SiS 190 PCI Fast Ethernet adapter" }, | 335 | { "SiS 190 PCI Fast Ethernet adapter" }, |
diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c index b28336148658..c1b47d74e206 100644 --- a/drivers/usb/atm/speedtch.c +++ b/drivers/usb/atm/speedtch.c | |||
@@ -532,9 +532,9 @@ static void speedtch_handle_int(struct urb *int_urb, struct pt_regs *regs) | |||
532 | int ret = int_urb->status; | 532 | int ret = int_urb->status; |
533 | 533 | ||
534 | /* The magic interrupt for "up state" */ | 534 | /* The magic interrupt for "up state" */ |
535 | const static unsigned char up_int[6] = { 0xa1, 0x00, 0x01, 0x00, 0x00, 0x00 }; | 535 | static const unsigned char up_int[6] = { 0xa1, 0x00, 0x01, 0x00, 0x00, 0x00 }; |
536 | /* The magic interrupt for "down state" */ | 536 | /* The magic interrupt for "down state" */ |
537 | const static unsigned char down_int[6] = { 0xa1, 0x00, 0x00, 0x00, 0x00, 0x00 }; | 537 | static const unsigned char down_int[6] = { 0xa1, 0x00, 0x00, 0x00, 0x00, 0x00 }; |
538 | 538 | ||
539 | atm_dbg(usbatm, "%s entered\n", __func__); | 539 | atm_dbg(usbatm, "%s entered\n", __func__); |
540 | 540 | ||
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c index 458f2acdeb0a..28538db9eaf3 100644 --- a/drivers/usb/image/microtek.c +++ b/drivers/usb/image/microtek.c | |||
@@ -674,7 +674,7 @@ struct vendor_product | |||
674 | 674 | ||
675 | 675 | ||
676 | /* These are taken from the msmUSB.inf file on the Windows driver CD */ | 676 | /* These are taken from the msmUSB.inf file on the Windows driver CD */ |
677 | const static struct vendor_product mts_supported_products[] = | 677 | static const struct vendor_product mts_supported_products[] = |
678 | { | 678 | { |
679 | { "Phantom 336CX", mts_sup_unknown}, | 679 | { "Phantom 336CX", mts_sup_unknown}, |
680 | { "Phantom 336CX", mts_sup_unknown}, | 680 | { "Phantom 336CX", mts_sup_unknown}, |