diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-pxa/leds-mainstone.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/cpu.c | 2 | ||||
-rw-r--r-- | arch/frv/kernel/gdb-stub.c | 2 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/bte.c | 2 | ||||
-rw-r--r-- | arch/ia64/sn/pci/tioca_provider.c | 2 | ||||
-rw-r--r-- | arch/mips/mm/dma-ip32.c | 6 | ||||
-rw-r--r-- | arch/ppc/syslib/ppc85xx_setup.c | 2 | ||||
-rw-r--r-- | arch/sparc64/kernel/irq.c | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm/mach-pxa/leds-mainstone.c b/arch/arm/mach-pxa/leds-mainstone.c index bbd3f87a9fc2..c06d3d7a8dd4 100644 --- a/arch/arm/mach-pxa/leds-mainstone.c +++ b/arch/arm/mach-pxa/leds-mainstone.c | |||
@@ -85,7 +85,7 @@ void mainstone_leds_event(led_event_t evt) | |||
85 | break; | 85 | break; |
86 | 86 | ||
87 | case led_green_on: | 87 | case led_green_on: |
88 | hw_led_state |= D21;; | 88 | hw_led_state |= D21; |
89 | break; | 89 | break; |
90 | 90 | ||
91 | case led_green_off: | 91 | case led_green_off: |
@@ -93,7 +93,7 @@ void mainstone_leds_event(led_event_t evt) | |||
93 | break; | 93 | break; |
94 | 94 | ||
95 | case led_amber_on: | 95 | case led_amber_on: |
96 | hw_led_state |= D22;; | 96 | hw_led_state |= D22; |
97 | break; | 97 | break; |
98 | 98 | ||
99 | case led_amber_off: | 99 | case led_amber_off: |
@@ -101,7 +101,7 @@ void mainstone_leds_event(led_event_t evt) | |||
101 | break; | 101 | break; |
102 | 102 | ||
103 | case led_red_on: | 103 | case led_red_on: |
104 | hw_led_state |= D23;; | 104 | hw_led_state |= D23; |
105 | break; | 105 | break; |
106 | 106 | ||
107 | case led_red_off: | 107 | case led_red_off: |
diff --git a/arch/arm/mach-s3c2410/cpu.c b/arch/arm/mach-s3c2410/cpu.c index 00a379334b60..70c34fcf7858 100644 --- a/arch/arm/mach-s3c2410/cpu.c +++ b/arch/arm/mach-s3c2410/cpu.c | |||
@@ -146,7 +146,7 @@ void s3c24xx_set_board(struct s3c24xx_board *b) | |||
146 | board = b; | 146 | board = b; |
147 | 147 | ||
148 | if (b->clocks_count != 0) { | 148 | if (b->clocks_count != 0) { |
149 | struct clk **ptr = b->clocks;; | 149 | struct clk **ptr = b->clocks; |
150 | 150 | ||
151 | for (i = b->clocks_count; i > 0; i--, ptr++) | 151 | for (i = b->clocks_count; i > 0; i--, ptr++) |
152 | s3c24xx_register_clock(*ptr); | 152 | s3c24xx_register_clock(*ptr); |
diff --git a/arch/frv/kernel/gdb-stub.c b/arch/frv/kernel/gdb-stub.c index 8f860d9c4947..508601fad079 100644 --- a/arch/frv/kernel/gdb-stub.c +++ b/arch/frv/kernel/gdb-stub.c | |||
@@ -1406,7 +1406,7 @@ void gdbstub(int sigval) | |||
1406 | __debug_frame->psr |= PSR_S; | 1406 | __debug_frame->psr |= PSR_S; |
1407 | __debug_regs->brr = (__debug_frame->tbr & TBR_TT) << 12; | 1407 | __debug_regs->brr = (__debug_frame->tbr & TBR_TT) << 12; |
1408 | __debug_regs->brr |= BRR_EB; | 1408 | __debug_regs->brr |= BRR_EB; |
1409 | sigval = SIGXCPU;; | 1409 | sigval = SIGXCPU; |
1410 | } | 1410 | } |
1411 | 1411 | ||
1412 | LEDS(0x5002); | 1412 | LEDS(0x5002); |
diff --git a/arch/ia64/sn/kernel/bte.c b/arch/ia64/sn/kernel/bte.c index 1f11db470d90..e952ef4f6d91 100644 --- a/arch/ia64/sn/kernel/bte.c +++ b/arch/ia64/sn/kernel/bte.c | |||
@@ -36,7 +36,7 @@ static struct bteinfo_s *bte_if_on_node(nasid_t nasid, int interface) | |||
36 | nodepda_t *tmp_nodepda; | 36 | nodepda_t *tmp_nodepda; |
37 | 37 | ||
38 | if (nasid_to_cnodeid(nasid) == -1) | 38 | if (nasid_to_cnodeid(nasid) == -1) |
39 | return (struct bteinfo_s *)NULL;; | 39 | return (struct bteinfo_s *)NULL; |
40 | 40 | ||
41 | tmp_nodepda = NODEPDA(nasid_to_cnodeid(nasid)); | 41 | tmp_nodepda = NODEPDA(nasid_to_cnodeid(nasid)); |
42 | return &tmp_nodepda->bte_if[interface]; | 42 | return &tmp_nodepda->bte_if[interface]; |
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c index 7571a4025529..be0176912968 100644 --- a/arch/ia64/sn/pci/tioca_provider.c +++ b/arch/ia64/sn/pci/tioca_provider.c | |||
@@ -377,7 +377,7 @@ tioca_dma_mapped(struct pci_dev *pdev, u64 paddr, size_t req_size) | |||
377 | struct tioca_dmamap *ca_dmamap; | 377 | struct tioca_dmamap *ca_dmamap; |
378 | void *map; | 378 | void *map; |
379 | unsigned long flags; | 379 | unsigned long flags; |
380 | struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(pdev);; | 380 | struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(pdev); |
381 | 381 | ||
382 | tioca_common = (struct tioca_common *)pcidev_info->pdi_pcibus_info; | 382 | tioca_common = (struct tioca_common *)pcidev_info->pdi_pcibus_info; |
383 | tioca_kern = (struct tioca_kernel *)tioca_common->ca_kernel_private; | 383 | tioca_kern = (struct tioca_kernel *)tioca_common->ca_kernel_private; |
diff --git a/arch/mips/mm/dma-ip32.c b/arch/mips/mm/dma-ip32.c index a7e3072ff78d..ec54ed0d26ff 100644 --- a/arch/mips/mm/dma-ip32.c +++ b/arch/mips/mm/dma-ip32.c | |||
@@ -138,7 +138,7 @@ dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size, | |||
138 | BUG(); | 138 | BUG(); |
139 | } | 139 | } |
140 | 140 | ||
141 | addr = virt_to_phys(ptr)&RAM_OFFSET_MASK;; | 141 | addr = virt_to_phys(ptr)&RAM_OFFSET_MASK; |
142 | if(dev == NULL) | 142 | if(dev == NULL) |
143 | addr+=CRIME_HI_MEM_BASE; | 143 | addr+=CRIME_HI_MEM_BASE; |
144 | return (dma_addr_t)addr; | 144 | return (dma_addr_t)addr; |
@@ -179,7 +179,7 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, | |||
179 | addr = (unsigned long) page_address(sg->page)+sg->offset; | 179 | addr = (unsigned long) page_address(sg->page)+sg->offset; |
180 | if (addr) | 180 | if (addr) |
181 | __dma_sync(addr, sg->length, direction); | 181 | __dma_sync(addr, sg->length, direction); |
182 | addr = __pa(addr)&RAM_OFFSET_MASK;; | 182 | addr = __pa(addr)&RAM_OFFSET_MASK; |
183 | if(dev == NULL) | 183 | if(dev == NULL) |
184 | addr += CRIME_HI_MEM_BASE; | 184 | addr += CRIME_HI_MEM_BASE; |
185 | sg->dma_address = (dma_addr_t)addr; | 185 | sg->dma_address = (dma_addr_t)addr; |
@@ -199,7 +199,7 @@ dma_addr_t dma_map_page(struct device *dev, struct page *page, | |||
199 | 199 | ||
200 | addr = (unsigned long) page_address(page) + offset; | 200 | addr = (unsigned long) page_address(page) + offset; |
201 | dma_cache_wback_inv(addr, size); | 201 | dma_cache_wback_inv(addr, size); |
202 | addr = __pa(addr)&RAM_OFFSET_MASK;; | 202 | addr = __pa(addr)&RAM_OFFSET_MASK; |
203 | if(dev == NULL) | 203 | if(dev == NULL) |
204 | addr += CRIME_HI_MEM_BASE; | 204 | addr += CRIME_HI_MEM_BASE; |
205 | 205 | ||
diff --git a/arch/ppc/syslib/ppc85xx_setup.c b/arch/ppc/syslib/ppc85xx_setup.c index e70b34ee6275..79b7089d7500 100644 --- a/arch/ppc/syslib/ppc85xx_setup.c +++ b/arch/ppc/syslib/ppc85xx_setup.c | |||
@@ -235,7 +235,7 @@ mpc85xx_setup_pci2(struct pci_controller *hose) | |||
235 | (__ilog2(MPC85XX_PCI2_UPPER_MEM - MPC85XX_PCI2_LOWER_MEM + 1) - 1); | 235 | (__ilog2(MPC85XX_PCI2_UPPER_MEM - MPC85XX_PCI2_LOWER_MEM + 1) - 1); |
236 | 236 | ||
237 | /* Setup outbound IO windows @ MPC85XX_PCI2_IO_BASE */ | 237 | /* Setup outbound IO windows @ MPC85XX_PCI2_IO_BASE */ |
238 | pci->potar2 = (MPC85XX_PCI2_LOWER_IO >> 12) & 0x000fffff;; | 238 | pci->potar2 = (MPC85XX_PCI2_LOWER_IO >> 12) & 0x000fffff; |
239 | pci->potear2 = 0x00000000; | 239 | pci->potear2 = 0x00000000; |
240 | pci->powbar2 = (MPC85XX_PCI2_IO_BASE >> 12) & 0x000fffff; | 240 | pci->powbar2 = (MPC85XX_PCI2_IO_BASE >> 12) & 0x000fffff; |
241 | /* Enable, IO R/W */ | 241 | /* Enable, IO R/W */ |
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c index e505a4125e35..11e645c9ec50 100644 --- a/arch/sparc64/kernel/irq.c +++ b/arch/sparc64/kernel/irq.c | |||
@@ -727,7 +727,7 @@ void handler_irq(int irq, struct pt_regs *regs) | |||
727 | } | 727 | } |
728 | 728 | ||
729 | #ifdef CONFIG_BLK_DEV_FD | 729 | #ifdef CONFIG_BLK_DEV_FD |
730 | extern irqreturn_t floppy_interrupt(int, void *, struct pt_regs *);; | 730 | extern irqreturn_t floppy_interrupt(int, void *, struct pt_regs *); |
731 | 731 | ||
732 | /* XXX No easy way to include asm/floppy.h XXX */ | 732 | /* XXX No easy way to include asm/floppy.h XXX */ |
733 | extern unsigned char *pdma_vaddr; | 733 | extern unsigned char *pdma_vaddr; |