Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 326127
b: refs/heads/master
c: e98b6a4
h: refs/heads/master
i:
  326125: ee9aecf
  326123: 549302e
  326119: fe74995
  326111: 26e5d29
v: v3
  • Loading branch information
Ramneek Mehresh authored and Greg Kroah-Hartman committed Sep 21, 2012
1 parent 343912d commit 5c93901
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c638eb2872b3af079501e7ee44cbb8a5cce9b4b5
refs/heads/master: e98b6a4f9667e41eb96104991794eb29212ec2b7
2 changes: 2 additions & 0 deletions trunk/drivers/usb/host/fsl-mph-dr-of.c
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ static int usb_get_ver_info(struct device_node *np)
ver = FSL_USB_VER_1_6;
else if (of_device_is_compatible(np, "fsl-usb2-dr-v2.2"))
ver = FSL_USB_VER_2_2;
else if (of_device_is_compatible(np, "fsl-usb2-dr-v2.4"))
ver = FSL_USB_VER_2_4;
else /* for previous controller versions */
ver = FSL_USB_VER_OLD;

Expand Down
1 change: 1 addition & 0 deletions trunk/include/linux/fsl_devices.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#define FSL_USB_VER_OLD 0
#define FSL_USB_VER_1_6 1
#define FSL_USB_VER_2_2 2
#define FSL_USB_VER_2_4 3

#include <linux/types.h>

Expand Down

0 comments on commit 5c93901

Please sign in to comment.