Commit ee3da660 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk

into home.osdl.org:/home/torvalds/v2.5/linux
parents 4ee0756d 9b53fb25
...@@ -187,10 +187,6 @@ static struct irqchip clps7500_no_chip = { ...@@ -187,10 +187,6 @@ static struct irqchip clps7500_no_chip = {
.unmask = cl7500_no_action, .unmask = cl7500_no_action,
}; };
static void no_action(int cpl, void *dev_id, struct pt_regs *regs)
{
}
static struct irqaction irq_isa = { no_action, 0, 0, "isa", NULL, NULL }; static struct irqaction irq_isa = { no_action, 0, 0, "isa", NULL, NULL };
static void __init clps7500_init_irq(void) static void __init clps7500_init_irq(void)
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/device.h> #include <linux/device.h>
...@@ -90,3 +91,6 @@ int lm_device_register(struct lm_device *dev) ...@@ -90,3 +91,6 @@ int lm_device_register(struct lm_device *dev)
} }
return ret; return ret;
} }
EXPORT_SYMBOL(lm_driver_register);
EXPORT_SYMBOL(lm_driver_unregister);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment