aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/kernel/irq.c2
-rw-r--r--arch/arm/kernel/smp.c2
-rw-r--r--drivers/video/amba-clcd.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index 9def4404e1f2..6f86d0af7c56 100644
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -995,7 +995,7 @@ void __init init_irq_proc(void)
995 struct proc_dir_entry *dir; 995 struct proc_dir_entry *dir;
996 int irq; 996 int irq;
997 997
998 dir = proc_mkdir("irq", 0); 998 dir = proc_mkdir("irq", NULL);
999 if (!dir) 999 if (!dir)
1000 return; 1000 return;
1001 1001
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index f65750a3d28b..f5fc57e0fe41 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -515,7 +515,7 @@ static void ipi_cpu_stop(unsigned int cpu)
515 * 515 *
516 * Bit 0 - Inter-processor function call 516 * Bit 0 - Inter-processor function call
517 */ 517 */
518void do_IPI(struct pt_regs *regs) 518asmlinkage void do_IPI(struct pt_regs *regs)
519{ 519{
520 unsigned int cpu = smp_processor_id(); 520 unsigned int cpu = smp_processor_id();
521 struct ipi_data *ipi = &per_cpu(ipi_data, cpu); 521 struct ipi_data *ipi = &per_cpu(ipi_data, cpu);
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index 467a1d7ebbde..a3c2c45e29e0 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -518,7 +518,7 @@ static struct amba_driver clcd_driver = {
518 .id_table = clcdfb_id_table, 518 .id_table = clcdfb_id_table,
519}; 519};
520 520
521int __init amba_clcdfb_init(void) 521static int __init amba_clcdfb_init(void)
522{ 522{
523 if (fb_get_options("ambafb", NULL)) 523 if (fb_get_options("ambafb", NULL))
524 return -ENODEV; 524 return -ENODEV;