diff options
-rw-r--r-- | Documentation/ia64/aliasing-test.c | 2 | ||||
-rw-r--r-- | arch/alpha/boot/tools/mkbb.c | 2 | ||||
-rw-r--r-- | arch/arm/mm/alignment.c | 2 | ||||
-rw-r--r-- | arch/mips/jmr3927/rbhma3100/kgdb_io.c | 2 | ||||
-rw-r--r-- | arch/mips/pci/pci-ocelot.c | 14 | ||||
-rw-r--r-- | drivers/mtd/nand/ppchameleonevb.c | 4 | ||||
-rw-r--r-- | drivers/net/fec_8xx/fec_main.c | 2 | ||||
-rw-r--r-- | drivers/scsi/NCR5380.c | 2 | ||||
-rw-r--r-- | fs/udf/super.c | 2 |
9 files changed, 16 insertions, 16 deletions
diff --git a/Documentation/ia64/aliasing-test.c b/Documentation/ia64/aliasing-test.c index 3153167b41c3..d485256ee1ce 100644 --- a/Documentation/ia64/aliasing-test.c +++ b/Documentation/ia64/aliasing-test.c | |||
@@ -197,7 +197,7 @@ skip: | |||
197 | return rc; | 197 | return rc; |
198 | } | 198 | } |
199 | 199 | ||
200 | main() | 200 | int main() |
201 | { | 201 | { |
202 | int rc; | 202 | int rc; |
203 | 203 | ||
diff --git a/arch/alpha/boot/tools/mkbb.c b/arch/alpha/boot/tools/mkbb.c index 23c7190b047c..632a7fd6d7dc 100644 --- a/arch/alpha/boot/tools/mkbb.c +++ b/arch/alpha/boot/tools/mkbb.c | |||
@@ -81,7 +81,7 @@ typedef union __bootblock { | |||
81 | #define bootblock_label __u1.__label | 81 | #define bootblock_label __u1.__label |
82 | #define bootblock_checksum __u2.__checksum | 82 | #define bootblock_checksum __u2.__checksum |
83 | 83 | ||
84 | main(int argc, char ** argv) | 84 | int main(int argc, char ** argv) |
85 | { | 85 | { |
86 | bootblock bootblock_from_disk; | 86 | bootblock bootblock_from_disk; |
87 | bootblock bootloader_image; | 87 | bootblock bootloader_image; |
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index 36440c899583..074b7cb07743 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c | |||
@@ -630,7 +630,7 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) | |||
630 | 630 | ||
631 | fs = get_fs(); | 631 | fs = get_fs(); |
632 | set_fs(KERNEL_DS); | 632 | set_fs(KERNEL_DS); |
633 | if thumb_mode(regs) { | 633 | if (thumb_mode(regs)) { |
634 | fault = __get_user(tinstr, (u16 *)(instrptr & ~1)); | 634 | fault = __get_user(tinstr, (u16 *)(instrptr & ~1)); |
635 | if (!(fault)) | 635 | if (!(fault)) |
636 | instr = thumb2arm(tinstr); | 636 | instr = thumb2arm(tinstr); |
diff --git a/arch/mips/jmr3927/rbhma3100/kgdb_io.c b/arch/mips/jmr3927/rbhma3100/kgdb_io.c index 2604f2c9a96e..342579cfdc01 100644 --- a/arch/mips/jmr3927/rbhma3100/kgdb_io.c +++ b/arch/mips/jmr3927/rbhma3100/kgdb_io.c | |||
@@ -36,7 +36,7 @@ | |||
36 | #define TIMEOUT 0xffffff | 36 | #define TIMEOUT 0xffffff |
37 | 37 | ||
38 | static int remoteDebugInitialized = 0; | 38 | static int remoteDebugInitialized = 0; |
39 | static void debugInit(int baud) | 39 | static void debugInit(int baud); |
40 | 40 | ||
41 | int putDebugChar(unsigned char c) | 41 | int putDebugChar(unsigned char c) |
42 | { | 42 | { |
diff --git a/arch/mips/pci/pci-ocelot.c b/arch/mips/pci/pci-ocelot.c index 7f94f26d35ae..1421d34535ef 100644 --- a/arch/mips/pci/pci-ocelot.c +++ b/arch/mips/pci/pci-ocelot.c | |||
@@ -71,19 +71,19 @@ static inline void pci0WriteConfigReg(unsigned int offset, unsigned int data) | |||
71 | } | 71 | } |
72 | 72 | ||
73 | static struct resource ocelot_mem_resource = { | 73 | static struct resource ocelot_mem_resource = { |
74 | start = GT_PCI_MEM_BASE; | 74 | .start = GT_PCI_MEM_BASE, |
75 | end = GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1; | 75 | .end = GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1, |
76 | }; | 76 | }; |
77 | 77 | ||
78 | static struct resource ocelot_io_resource = { | 78 | static struct resource ocelot_io_resource = { |
79 | start = GT_PCI_IO_BASE; | 79 | .start = GT_PCI_IO_BASE, |
80 | end = GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1; | 80 | .end = GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1, |
81 | }; | 81 | }; |
82 | 82 | ||
83 | static struct pci_controller ocelot_pci_controller = { | 83 | static struct pci_controller ocelot_pci_controller = { |
84 | .pci_ops = gt64xxx_pci0_ops; | 84 | .pci_ops = gt64xxx_pci0_ops, |
85 | .mem_resource = &ocelot_mem_resource; | 85 | .mem_resource = &ocelot_mem_resource, |
86 | .io_resource = &ocelot_io_resource; | 86 | .io_resource = &ocelot_io_resource, |
87 | }; | 87 | }; |
88 | 88 | ||
89 | static int __init ocelot_pcibios_init(void) | 89 | static int __init ocelot_pcibios_init(void) |
diff --git a/drivers/mtd/nand/ppchameleonevb.c b/drivers/mtd/nand/ppchameleonevb.c index 38fe9e998ee5..082073acf20f 100644 --- a/drivers/mtd/nand/ppchameleonevb.c +++ b/drivers/mtd/nand/ppchameleonevb.c | |||
@@ -424,9 +424,9 @@ static void __exit ppchameleonevb_cleanup(void) | |||
424 | 424 | ||
425 | /* Release iomaps */ | 425 | /* Release iomaps */ |
426 | this = (struct nand_chip *) &ppchameleon_mtd[1]; | 426 | this = (struct nand_chip *) &ppchameleon_mtd[1]; |
427 | iounmap((void *) this->IO_ADDR_R; | 427 | iounmap((void *) this->IO_ADDR_R); |
428 | this = (struct nand_chip *) &ppchameleonevb_mtd[1]; | 428 | this = (struct nand_chip *) &ppchameleonevb_mtd[1]; |
429 | iounmap((void *) this->IO_ADDR_R; | 429 | iounmap((void *) this->IO_ADDR_R); |
430 | 430 | ||
431 | /* Free the MTD device structure */ | 431 | /* Free the MTD device structure */ |
432 | kfree (ppchameleon_mtd); | 432 | kfree (ppchameleon_mtd); |
diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c index 88efe9731bab..e5502af5b8e2 100644 --- a/drivers/net/fec_8xx/fec_main.c +++ b/drivers/net/fec_8xx/fec_main.c | |||
@@ -550,7 +550,7 @@ static int fec_enet_rx_common(struct net_device *dev, int *budget) | |||
550 | skbn = dev_alloc_skb(pkt_len + 2); | 550 | skbn = dev_alloc_skb(pkt_len + 2); |
551 | if (skbn != NULL) { | 551 | if (skbn != NULL) { |
552 | skb_reserve(skbn, 2); /* align IP header */ | 552 | skb_reserve(skbn, 2); /* align IP header */ |
553 | skb_copy_from_linear_data(skb | 553 | skb_copy_from_linear_data(skb, |
554 | skbn->data, | 554 | skbn->data, |
555 | pkt_len); | 555 | pkt_len); |
556 | /* swap */ | 556 | /* swap */ |
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index bb3cb3360541..88ea5a1fb606 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c | |||
@@ -2625,7 +2625,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance) { | |||
2625 | #ifdef REAL_DMA | 2625 | #ifdef REAL_DMA |
2626 | static void NCR5380_dma_complete(NCR5380_instance * instance) { | 2626 | static void NCR5380_dma_complete(NCR5380_instance * instance) { |
2627 | NCR5380_local_declare(); | 2627 | NCR5380_local_declare(); |
2628 | struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata * instance->hostdata); | 2628 | struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata; |
2629 | int transferred; | 2629 | int transferred; |
2630 | NCR5380_setup(instance); | 2630 | NCR5380_setup(instance); |
2631 | 2631 | ||
diff --git a/fs/udf/super.c b/fs/udf/super.c index 3a743d854c17..6658afb41cc7 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c | |||
@@ -1351,7 +1351,7 @@ udf_load_partition(struct super_block *sb, kernel_lb_addr *fileset) | |||
1351 | 1351 | ||
1352 | for (i=0; i<UDF_SB_NUMPARTS(sb); i++) | 1352 | for (i=0; i<UDF_SB_NUMPARTS(sb); i++) |
1353 | { | 1353 | { |
1354 | switch UDF_SB_PARTTYPE(sb, i) | 1354 | switch (UDF_SB_PARTTYPE(sb, i)) |
1355 | { | 1355 | { |
1356 | case UDF_VIRTUAL_MAP15: | 1356 | case UDF_VIRTUAL_MAP15: |
1357 | case UDF_VIRTUAL_MAP20: | 1357 | case UDF_VIRTUAL_MAP20: |