From 9b4de2611dd53626be58d6730cc355b3607e9611 Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Sun, 5 Aug 2012 22:47:00 -0700
Subject: [PATCH] --- yaml --- r: 322535 b: refs/heads/master c:
 e26a6038d3a902cd0bc784fc55571a83d7f9cb79 h: refs/heads/master i:   322533:
 ba991f56a7a68ca9b572378da673d55d9d3fcc0a   322531:
 991858775153d00760c32a4598ea1ea181843a92   322527:
 3dbd50b8e147e78fd7513b4322d9e0f784abc9a5 v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/arm/mach-shmobile/board-mackerel.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3b441f933cd9..237ea07009ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee3c843d0fc21c68ced93b982b5731178a24df68
+refs/heads/master: e26a6038d3a902cd0bc784fc55571a83d7f9cb79
diff --git a/trunk/arch/arm/mach-shmobile/board-mackerel.c b/trunk/arch/arm/mach-shmobile/board-mackerel.c
index 7ea2b31e3199..c129542f6aed 100644
--- a/trunk/arch/arm/mach-shmobile/board-mackerel.c
+++ b/trunk/arch/arm/mach-shmobile/board-mackerel.c
@@ -695,6 +695,7 @@ static struct platform_device usbhs0_device = {
  *  - J30 "open"
  *  - modify usbhs1_get_id() USBHS_HOST -> USBHS_GADGET
  *  - add .get_vbus = usbhs_get_vbus in usbhs1_private
+ *  - check usbhs0_device(pio)/usbhs1_device(irq) order in mackerel_devices.
  */
 #define IRQ8 evt2irq(0x0300)
 #define USB_PHY_MODE		(1 << 4)
@@ -1325,8 +1326,8 @@ static struct platform_device *mackerel_devices[] __initdata = {
 	&nor_flash_device,
 	&smc911x_device,
 	&lcdc_device,
-	&usbhs1_device,
 	&usbhs0_device,
+	&usbhs1_device,
 	&leds_device,
 	&fsi_device,
 	&fsi_ak4643_device,