From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 17 Jun 2009 07:37:26 +0000 (+0900)
Subject: Merge branches 'sh/pci-express-integration', 'sh/rsk-updates', 'sh/platform-updates... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3d3638da49211cf15f8aec3030990ac6fba4c693;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge branches 'sh/pci-express-integration', 'sh/rsk-updates', 'sh/platform-updates' and 'sh/perf_counter'
---

3d3638da49211cf15f8aec3030990ac6fba4c693
diff --cc arch/sh/boards/mach-highlander/setup.c
index dd297d87f934,20fe72c515d5,20fe72c515d5,920ea76abac8,20fe72c515d5..1639f8915000
--- a/arch/sh/boards/mach-highlander/setup.c
+++ b/arch/sh/boards/mach-highlander/setup.c
@@@@@@ -17,9 -17,8 -17,8 -17,10 -17,8 +17,11 @@@@@@
     #include <linux/platform_device.h>
     #include <linux/ata_platform.h>
     #include <linux/types.h>
 ++++#include <linux/mtd/physmap.h>
     #include <linux/i2c.h>
     #include <linux/irq.h>
+++ +#include <linux/interrupt.h>
+++ +#include <linux/usb/r8a66597.h>
     #include <net/ax88796.h>
     #include <asm/machvec.h>
     #include <mach/highlander.h>