From de76d9127a35eed776966495624b1482e6f5ff3d Mon Sep 17 00:00:00 2001
From: Li Yang <leoli@freescale.com>
Date: Sat, 8 Nov 2008 20:51:34 +0300
Subject: [PATCH] --- yaml --- r: 118687 b: refs/heads/master c:
 2b48706560cd4811654582a4a194c67a8562d602 h: refs/heads/master i:   118685:
 13d669dbca21e48d8734ccb0d5d9c6ef6cb732fa   118683:
 926ed00d1207f142309f4ca94f296506b3623dd8   118679:
 b3c0f441ca44c2ffa6c57933c18d53bffa103a77   118671:
 625076c76cd47cc7de34d7628f15f30142e126d9   118655:
 25661028c5d3e77f3ab1cb97ab27186b50403665 v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/powerpc/include/asm/immap_cpm2.h | 9 +++------
 trunk/arch/powerpc/include/asm/immap_qe.h   | 5 +----
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 76cc6e89da25..234300058bcf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33d2d78baaed06dda9f4de105388832850fb3555
+refs/heads/master: 2b48706560cd4811654582a4a194c67a8562d602
diff --git a/trunk/arch/powerpc/include/asm/immap_cpm2.h b/trunk/arch/powerpc/include/asm/immap_cpm2.h
index 4080bab0468c..d4f069bf0e57 100644
--- a/trunk/arch/powerpc/include/asm/immap_cpm2.h
+++ b/trunk/arch/powerpc/include/asm/immap_cpm2.h
@@ -554,14 +554,11 @@ typedef struct usb_ctlr {
 	u8	usb_usadr;
 	u8	usb_uscom;
 	u8	res1[1];
-	u16	usb_usep1;
-	u16	usb_usep2;
-	u16	usb_usep3;
-	u16	usb_usep4;
+	__be16  usb_usep[4];
 	u8	res2[4];
-	u16	usb_usber;
+	__be16  usb_usber;
 	u8	res3[2];
-	u16	usb_usbmr;
+	__be16  usb_usbmr;
 	u8	usb_usbs;
 	u8	res4[7];
 } usb_cpm2_t;
diff --git a/trunk/arch/powerpc/include/asm/immap_qe.h b/trunk/arch/powerpc/include/asm/immap_qe.h
index 3c2fced3ac22..c346d0bcd230 100644
--- a/trunk/arch/powerpc/include/asm/immap_qe.h
+++ b/trunk/arch/powerpc/include/asm/immap_qe.h
@@ -215,10 +215,7 @@ struct usb_ctlr {
 	u8	usb_usadr;
 	u8	usb_uscom;
 	u8	res1[1];
-	__be16	usb_usep1;
-	__be16	usb_usep2;
-	__be16	usb_usep3;
-	__be16	usb_usep4;
+	__be16  usb_usep[4];
 	u8	res2[4];
 	__be16	usb_usber;
 	u8	res3[2];