Merge branches 'sh/pci-express-integration', 'sh/rsk-updates', 'sh/platform-updates...
Paul Mundt [Wed, 17 Jun 2009 07:37:26 +0000 (16:37 +0900)]
1  2  3  4  5 
arch/sh/Kconfig
arch/sh/boards/mach-highlander/setup.c

diff --cc arch/sh/Kconfig
Simple merge
     #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>