Merge bk://kernel.bkbits.net/gregkh/linux/i2c-2.6

into home.osdl.org:/home/torvalds/v2.5/linux

arch/arm/mach-clps7500/core.c

@@ -187,10 +187,6 @@ static struct irqchip clps7500_no_chip = {
 	.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 void __init clps7500_init_irq(void)

arch/arm/mach-integrator/lm.c

@@ -7,6 +7,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
 
@@ -90,3 +91,6 @@ int lm_device_register(struct lm_device *dev)
 	}
 	return ret;
 }
+
+EXPORT_SYMBOL(lm_driver_register);
+EXPORT_SYMBOL(lm_driver_unregister);