[IA64] Manual merge fix for 3 files

	arch/ia64/Kconfig
	arch/ia64/kernel/acpi.c
	include/asm-ia64/irq.h

Signed-off-by: Tony Luck <tony.luck@intel.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c
index 8a2425069088..7977eae50af2 100644
--- a/arch/m68k/mvme16x/rtc.c
+++ b/arch/m68k/mvme16x/rtc.c
@@ -161,7 +161,7 @@ static struct miscdevice rtc_dev=
         .fops =         &rtc_fops
 };
 
-int __init rtc_MK48T08_init(void)
+static int __init rtc_MK48T08_init(void)
 {
         if (!MACH_IS_MVME16x)
                 return -ENODEV;
@@ -169,4 +169,4 @@ int __init rtc_MK48T08_init(void)
         printk(KERN_INFO "MK48T08 Real Time Clock Driver v%s\n", RTC_VERSION);
         return misc_register(&rtc_dev);
 }
-
+module_init(rtc_MK48T08_init);