aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/mac
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-07-19 23:33:28 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-20 11:24:49 -0400
commit66a3f820cb6a88ef0481e042d4b48b2299deab7e (patch)
tree70deffd145252ce91a80a951c80db116a02947a2 /arch/m68k/mac
parent88f8bb780e13fd31f207e1752ee8624dc786381f (diff)
m68k: missing __init
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k/mac')
-rw-r--r--arch/m68k/mac/config.c6
-rw-r--r--arch/m68k/mac/macints.c4
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 9a7f14eb9df5..8547dbc5e8d7 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -85,7 +85,7 @@ extern void nubus_sweep_video(void);
85 85
86static void mac_get_model(char *str); 86static void mac_get_model(char *str);
87 87
88static void mac_sched_init(irq_handler_t vector) 88static void __init mac_sched_init(irq_handler_t vector)
89{ 89{
90 via_init_clock(vector); 90 via_init_clock(vector);
91} 91}
@@ -770,7 +770,7 @@ static struct mac_model mac_data_table[] = {
770 } 770 }
771}; 771};
772 772
773void mac_identify(void) 773void __init mac_identify(void)
774{ 774{
775 struct mac_model *m; 775 struct mac_model *m;
776 776
@@ -847,7 +847,7 @@ void mac_identify(void)
847 baboon_init(); 847 baboon_init();
848} 848}
849 849
850void mac_report_hardware(void) 850void __init mac_report_hardware(void)
851{ 851{
852 printk(KERN_INFO "Apple Macintosh %s\n", macintosh_config->name); 852 printk(KERN_INFO "Apple Macintosh %s\n", macintosh_config->name);
853} 853}
diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c
index 0fc72d8f786e..ecddac4a02b9 100644
--- a/arch/m68k/mac/macints.c
+++ b/arch/m68k/mac/macints.c
@@ -114,6 +114,7 @@
114 * 114 *
115 */ 115 */
116 116
117#include <linux/module.h>
117#include <linux/types.h> 118#include <linux/types.h>
118#include <linux/kernel.h> 119#include <linux/kernel.h>
119#include <linux/sched.h> 120#include <linux/sched.h>
@@ -224,7 +225,7 @@ static struct irq_controller mac_irq_controller = {
224 .disable = mac_disable_irq, 225 .disable = mac_disable_irq,
225}; 226};
226 227
227void mac_init_IRQ(void) 228void __init mac_init_IRQ(void)
228{ 229{
229#ifdef DEBUG_MACINTS 230#ifdef DEBUG_MACINTS
230 printk("mac_init_IRQ(): Setting things up...\n"); 231 printk("mac_init_IRQ(): Setting things up...\n");
@@ -391,6 +392,7 @@ int mac_irq_pending(unsigned int irq)
391 } 392 }
392 return 0; 393 return 0;
393} 394}
395EXPORT_SYMBOL(mac_irq_pending);
394 396
395static int num_debug[8]; 397static int num_debug[8];
396 398