diff options
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/boards/mpc1211/pci.c | 2 | ||||
-rw-r--r-- | arch/sh/drivers/pci/ops-sh4.c | 2 | ||||
-rw-r--r-- | arch/sh/drivers/pci/pci-st40.c | 2 | ||||
-rw-r--r-- | arch/sh/drivers/pci/pci.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/syscalls.S | 1 |
5 files changed, 5 insertions, 4 deletions
diff --git a/arch/sh/boards/mpc1211/pci.c b/arch/sh/boards/mpc1211/pci.c index 4ed1a95c6d56..23849f70f133 100644 --- a/arch/sh/boards/mpc1211/pci.c +++ b/arch/sh/boards/mpc1211/pci.c | |||
@@ -187,7 +187,7 @@ char * __devinit pcibios_setup(char *str) | |||
187 | * are examined. | 187 | * are examined. |
188 | */ | 188 | */ |
189 | 189 | ||
190 | void __init pcibios_fixup_bus(struct pci_bus *b) | 190 | void __devinit pcibios_fixup_bus(struct pci_bus *b) |
191 | { | 191 | { |
192 | pci_read_bridge_bases(b); | 192 | pci_read_bridge_bases(b); |
193 | } | 193 | } |
diff --git a/arch/sh/drivers/pci/ops-sh4.c b/arch/sh/drivers/pci/ops-sh4.c index 54232f13e406..710a3b0306e5 100644 --- a/arch/sh/drivers/pci/ops-sh4.c +++ b/arch/sh/drivers/pci/ops-sh4.c | |||
@@ -153,7 +153,7 @@ static void __init pci_fixup_ide_bases(struct pci_dev *d) | |||
153 | } | 153 | } |
154 | DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases); | 154 | DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases); |
155 | 155 | ||
156 | char * __init pcibios_setup(char *str) | 156 | char * __devinit pcibios_setup(char *str) |
157 | { | 157 | { |
158 | if (!strcmp(str, "off")) { | 158 | if (!strcmp(str, "off")) { |
159 | pci_probe = 0; | 159 | pci_probe = 0; |
diff --git a/arch/sh/drivers/pci/pci-st40.c b/arch/sh/drivers/pci/pci-st40.c index 543417ff8314..1502a14386b6 100644 --- a/arch/sh/drivers/pci/pci-st40.c +++ b/arch/sh/drivers/pci/pci-st40.c | |||
@@ -328,7 +328,7 @@ int __init st40pci_init(unsigned memStart, unsigned memSize) | |||
328 | return 1; | 328 | return 1; |
329 | } | 329 | } |
330 | 330 | ||
331 | char * __init pcibios_setup(char *str) | 331 | char * __devinit pcibios_setup(char *str) |
332 | { | 332 | { |
333 | return str; | 333 | return str; |
334 | } | 334 | } |
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index d439336d2e18..ccaba368ac9b 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c | |||
@@ -71,7 +71,7 @@ subsys_initcall(pcibios_init); | |||
71 | * Called after each bus is probed, but before its children | 71 | * Called after each bus is probed, but before its children |
72 | * are examined. | 72 | * are examined. |
73 | */ | 73 | */ |
74 | void __init pcibios_fixup_bus(struct pci_bus *bus) | 74 | void __devinit pcibios_fixup_bus(struct pci_bus *bus) |
75 | { | 75 | { |
76 | pci_read_bridge_bases(bus); | 76 | pci_read_bridge_bases(bus); |
77 | } | 77 | } |
diff --git a/arch/sh/kernel/syscalls.S b/arch/sh/kernel/syscalls.S index ff5656e60c05..91fb7024e06f 100644 --- a/arch/sh/kernel/syscalls.S +++ b/arch/sh/kernel/syscalls.S | |||
@@ -358,3 +358,4 @@ ENTRY(sys_call_table) | |||
358 | .long sys_signalfd | 358 | .long sys_signalfd |
359 | .long sys_timerfd | 359 | .long sys_timerfd |
360 | .long sys_eventfd | 360 | .long sys_eventfd |
361 | .long sys_fallocate | ||