diff options
-rw-r--r-- | drivers/char/watchdog/ixp2000_wdt.c | 2 | ||||
-rw-r--r-- | drivers/mtd/devices/pmc551.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/autcpu12.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/ppchameleonevb.c | 2 | ||||
-rw-r--r-- | drivers/net/amd8111e.c | 2 | ||||
-rw-r--r-- | drivers/net/amd8111e.h | 2 | ||||
-rw-r--r-- | drivers/net/skfp/smt.c | 2 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_core.c | 2 | ||||
-rw-r--r-- | sound/arm/sa11xx-uda1341.c | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/drivers/char/watchdog/ixp2000_wdt.c b/drivers/char/watchdog/ixp2000_wdt.c index fd955dbd588c..dc7548dcaf35 100644 --- a/drivers/char/watchdog/ixp2000_wdt.c +++ b/drivers/char/watchdog/ixp2000_wdt.c | |||
@@ -205,7 +205,7 @@ static void __exit ixp2000_wdt_exit(void) | |||
205 | module_init(ixp2000_wdt_init); | 205 | module_init(ixp2000_wdt_init); |
206 | module_exit(ixp2000_wdt_exit); | 206 | module_exit(ixp2000_wdt_exit); |
207 | 207 | ||
208 | MODULE_AUTHOR("Deepak Saxena <dsaxena@plexity.net">); | 208 | MODULE_AUTHOR("Deepak Saxena <dsaxena@plexity.net>"); |
209 | MODULE_DESCRIPTION("IXP2000 Network Processor Watchdog"); | 209 | MODULE_DESCRIPTION("IXP2000 Network Processor Watchdog"); |
210 | 210 | ||
211 | module_param(heartbeat, int, 0); | 211 | module_param(heartbeat, int, 0); |
diff --git a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c index a4873ab84e6b..e8f686f7a357 100644 --- a/drivers/mtd/devices/pmc551.c +++ b/drivers/mtd/devices/pmc551.c | |||
@@ -650,7 +650,7 @@ MODULE_DESCRIPTION(PMC551_VERSION); | |||
650 | */ | 650 | */ |
651 | static int msize = 0; | 651 | static int msize = 0; |
652 | #if defined(CONFIG_MTD_PMC551_APERTURE_SIZE) | 652 | #if defined(CONFIG_MTD_PMC551_APERTURE_SIZE) |
653 | static int asize = CONFIG_MTD_PMC551_APERTURE_SIZE | 653 | static int asize = CONFIG_MTD_PMC551_APERTURE_SIZE; |
654 | #else | 654 | #else |
655 | static int asize = 0; | 655 | static int asize = 0; |
656 | #endif | 656 | #endif |
diff --git a/drivers/mtd/nand/autcpu12.c b/drivers/mtd/nand/autcpu12.c index fe94ae9ae1f2..e3744eb8eccb 100644 --- a/drivers/mtd/nand/autcpu12.c +++ b/drivers/mtd/nand/autcpu12.c | |||
@@ -101,7 +101,7 @@ static void autcpu12_hwcontrol(struct mtd_info *mtd, int cmd, | |||
101 | struct nand_chip *chip = mtd->priv; | 101 | struct nand_chip *chip = mtd->priv; |
102 | 102 | ||
103 | if (ctrl & NAND_CTRL_CHANGE) { | 103 | if (ctrl & NAND_CTRL_CHANGE) { |
104 | void __iomem *addr | 104 | void __iomem *addr; |
105 | unsigned char bits; | 105 | unsigned char bits; |
106 | 106 | ||
107 | addr = CS89712_VIRT_BASE + AUTCPU12_SMC_PORT_OFFSET; | 107 | addr = CS89712_VIRT_BASE + AUTCPU12_SMC_PORT_OFFSET; |
diff --git a/drivers/mtd/nand/ppchameleonevb.c b/drivers/mtd/nand/ppchameleonevb.c index eb7d4d443deb..38fe9e998ee5 100644 --- a/drivers/mtd/nand/ppchameleonevb.c +++ b/drivers/mtd/nand/ppchameleonevb.c | |||
@@ -81,7 +81,7 @@ __setup("ppchameleonevb_fio_pbase=", ppchameleonevb_fio_pbase); | |||
81 | */ | 81 | */ |
82 | static struct mtd_partition partition_info_hi[] = { | 82 | static struct mtd_partition partition_info_hi[] = { |
83 | { .name = "PPChameleon HI Nand Flash", | 83 | { .name = "PPChameleon HI Nand Flash", |
84 | offset = 0, | 84 | .offset = 0, |
85 | .size = 128 * 1024 * 1024 | 85 | .size = 128 * 1024 * 1024 |
86 | } | 86 | } |
87 | }; | 87 | }; |
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index 675fe918421b..84b81642011c 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c | |||
@@ -155,7 +155,7 @@ This function will write into PHY registers. | |||
155 | */ | 155 | */ |
156 | static int amd8111e_write_phy(struct amd8111e_priv* lp,int phy_id, int reg, u32 val) | 156 | static int amd8111e_write_phy(struct amd8111e_priv* lp,int phy_id, int reg, u32 val) |
157 | { | 157 | { |
158 | unsigned int repeat = REPEAT_CNT | 158 | unsigned int repeat = REPEAT_CNT; |
159 | void __iomem *mmio = lp->mmio; | 159 | void __iomem *mmio = lp->mmio; |
160 | unsigned int reg_val; | 160 | unsigned int reg_val; |
161 | 161 | ||
diff --git a/drivers/net/amd8111e.h b/drivers/net/amd8111e.h index 2007510c4eb6..e65080a5994a 100644 --- a/drivers/net/amd8111e.h +++ b/drivers/net/amd8111e.h | |||
@@ -615,7 +615,7 @@ typedef enum { | |||
615 | #define SSTATE 2 | 615 | #define SSTATE 2 |
616 | 616 | ||
617 | /* Assume contoller gets data 10 times the maximum processing time */ | 617 | /* Assume contoller gets data 10 times the maximum processing time */ |
618 | #define REPEAT_CNT 10; | 618 | #define REPEAT_CNT 10 |
619 | 619 | ||
620 | /* amd8111e decriptor flag definitions */ | 620 | /* amd8111e decriptor flag definitions */ |
621 | typedef enum { | 621 | typedef enum { |
diff --git a/drivers/net/skfp/smt.c b/drivers/net/skfp/smt.c index fe847800acdc..75afc1f07ba0 100644 --- a/drivers/net/skfp/smt.c +++ b/drivers/net/skfp/smt.c | |||
@@ -1748,7 +1748,7 @@ char *addr_to_string(struct fddi_addr *addr) | |||
1748 | #endif | 1748 | #endif |
1749 | 1749 | ||
1750 | #ifdef AM29K | 1750 | #ifdef AM29K |
1751 | smt_ifconfig(int argc, char *argv[]) | 1751 | int smt_ifconfig(int argc, char *argv[]) |
1752 | { | 1752 | { |
1753 | if (argc >= 2 && !strcmp(argv[0],"opt_bypass") && | 1753 | if (argc >= 2 && !strcmp(argv[0],"opt_bypass") && |
1754 | !strcmp(argv[1],"yes")) { | 1754 | !strcmp(argv[1],"yes")) { |
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c index 9ddc6e4a74b0..05f692bd0adc 100644 --- a/drivers/scsi/aic7xxx/aic79xx_core.c +++ b/drivers/scsi/aic7xxx/aic79xx_core.c | |||
@@ -5180,7 +5180,7 @@ ahd_handle_devreset(struct ahd_softc *ahd, struct ahd_devinfo *devinfo, | |||
5180 | cur_lun = lun; | 5180 | cur_lun = lun; |
5181 | max_lun = lun; | 5181 | max_lun = lun; |
5182 | } | 5182 | } |
5183 | for (cur_lun <= max_lun; cur_lun++) { | 5183 | for (;cur_lun <= max_lun; cur_lun++) { |
5184 | struct ahd_tmode_lstate* lstate; | 5184 | struct ahd_tmode_lstate* lstate; |
5185 | 5185 | ||
5186 | lstate = tstate->enabled_luns[cur_lun]; | 5186 | lstate = tstate->enabled_luns[cur_lun]; |
diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c index c7e1b2646193..e7ed868fa7c0 100644 --- a/sound/arm/sa11xx-uda1341.c +++ b/sound/arm/sa11xx-uda1341.c | |||
@@ -987,7 +987,7 @@ static int __init sa11xx_uda1341_init(void) | |||
987 | if (platform_get_drvdata(device)) | 987 | if (platform_get_drvdata(device)) |
988 | return 0; | 988 | return 0; |
989 | platform_device_unregister(device); | 989 | platform_device_unregister(device); |
990 | err = -ENODEV | 990 | err = -ENODEV; |
991 | } else | 991 | } else |
992 | err = PTR_ERR(device); | 992 | err = PTR_ERR(device); |
993 | platform_driver_unregister(&sa11xx_uda1341_driver); | 993 | platform_driver_unregister(&sa11xx_uda1341_driver); |