---

yaml --- r: 118687 b: refs/heads/master c: 2b48706 h: refs/heads/master i: 118685: 13d669d 118683: 926ed00 118679: b3c0f44 118671: 625076c 118655: 2566102 v: v3
git-mirror · Nov 8, 2008 · de76d91 · de76d91
1 parent 8f11e0d
commit de76d91
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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];