From a4508ea1477222f5d55f3d44c8bb3f449e2a8103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20Acosta?= <csanchez@neurowork.net>
Date: Wed, 14 Apr 2010 06:58:53 -0500
Subject: [PATCH] --- yaml --- r: 195399 b: refs/heads/master c:
 44526f91b887a71ebd5d534903d55dc8752b8cd3 h: refs/heads/master i:   195397:
 0a33798af01b22deb866a6b1e7af3cfc7dc2d008   195395:
 b976b58ac745c63758296d71b571f4939ff5666a   195391:
 cf713ba71a29d0857ee4faa2f7071755a68fadc0 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/usb/core/devices.c | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index fa19026d9bcf..0e87df6fb0a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4545f7eea31f3f8486b7b925d67abe2e4e47a75a
+refs/heads/master: 44526f91b887a71ebd5d534903d55dc8752b8cd3
diff --git a/trunk/drivers/usb/core/devices.c b/trunk/drivers/usb/core/devices.c
index 75077215a8b8..3449742c00e1 100644
--- a/trunk/drivers/usb/core/devices.c
+++ b/trunk/drivers/usb/core/devices.c
@@ -1,7 +1,8 @@
 /*
  * devices.c
  * (C) Copyright 1999 Randy Dunlap.
- * (C) Copyright 1999,2000 Thomas Sailer <sailer@ife.ee.ethz.ch>. (proc file per device)
+ * (C) Copyright 1999,2000 Thomas Sailer <sailer@ife.ee.ethz.ch>.
+ *     (proc file per device)
  * (C) Copyright 1999 Deti Fliegl (new USB architecture)
  *
  * This program is free software; you can redistribute it and/or modify
@@ -57,7 +58,7 @@
 #include <linux/usbdevice_fs.h>
 #include <linux/usb/hcd.h>
 #include <linux/mutex.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #include "usb.h"
 
@@ -138,8 +139,8 @@ struct class_info {
 	char *class_name;
 };
 
-static const struct class_info clas_info[] =
-{					/* max. 5 chars. per name string */
+static const struct class_info clas_info[] = {
+	/* max. 5 chars. per name string */
 	{USB_CLASS_PER_INTERFACE,	">ifc"},
 	{USB_CLASS_AUDIO,		"audio"},
 	{USB_CLASS_COMM,		"comm."},
@@ -191,8 +192,10 @@ static char *usb_dump_endpoint_descriptor(int speed, char *start, char *end,
 
 	if (speed == USB_SPEED_HIGH) {
 		switch (le16_to_cpu(desc->wMaxPacketSize) & (0x03 << 11)) {
-		case 1 << 11:	bandwidth = 2; break;
-		case 2 << 11:	bandwidth = 3; break;
+		case 1 << 11:
+			bandwidth = 2; break;
+		case 2 << 11:
+			bandwidth = 3; break;
 		}
 	}
 
@@ -200,7 +203,7 @@ static char *usb_dump_endpoint_descriptor(int speed, char *start, char *end,
 	switch (usb_endpoint_type(desc)) {
 	case USB_ENDPOINT_XFER_CONTROL:
 		type = "Ctrl";
-		if (speed == USB_SPEED_HIGH) 	/* uframes per NAK */
+		if (speed == USB_SPEED_HIGH)	/* uframes per NAK */
 			interval = desc->bInterval;
 		else
 			interval = 0;