From: Tony Lindgren <tony@atomide.com>
Date: Tue, 2 Jan 2007 19:17:05 +0000 (-0800)
Subject: Merge with /home/tmlind/src/kernel/linux-2.6
X-Git-Tag: v2.6.21-omap1~189
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1e7dd7e4b94c2379530e45fbb3827b22b119e75f;p=linux-2.6-omap-h63xx.git

Merge with /home/tmlind/src/kernel/linux-2.6
---

1e7dd7e4b94c2379530e45fbb3827b22b119e75f
diff --cc arch/arm/mach-omap2/board-apollon.c
index ea12cc76239,878ff9181d0..5e1cada561d
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@@ -22,12 -22,9 +22,13 @@@
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
  #include <linux/mtd/onenand.h>
+ #include <linux/irq.h>
  #include <linux/interrupt.h>
  #include <linux/delay.h>
 +#include <linux/leds.h>
 +#include <linux/irq.h>
 +#include <linux/err.h>
 +#include <linux/clk.h>
  
  #include <asm/hardware.h>
  #include <asm/mach-types.h>