diff options
Diffstat (limited to 'arch')
-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 |
4 files changed, 10 insertions, 10 deletions
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) |