diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-19 16:50:26 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-19 16:50:38 +0400 |
| commit | 50ee9339c7347c2b16fa79d43777f72e9f41ef5a (patch) | |
| tree | ce09aa147e5c8bb74c72c46cebfdbffeece6678f /drivers/usb/otg/twl6030-usb.c | |
| parent | f0e615c3cb72b42191b558c130409335812621d8 (diff) | |
| parent | 98346f7db014614a4814eb60639f651f8bbc591d (diff) | |
| download | linux-50ee9339c7347c2b16fa79d43777f72e9f41ef5a.tar.xz | |
Merge 2.6.39-rc4 into usb-next
This is needed to help resolve some xhci issues and other minor
differences.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/otg/twl6030-usb.c')
| -rw-r--r-- | drivers/usb/otg/twl6030-usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/otg/twl6030-usb.c b/drivers/usb/otg/twl6030-usb.c index 8a91b4b832a1..6e920de64ef6 100644 --- a/drivers/usb/otg/twl6030-usb.c +++ b/drivers/usb/otg/twl6030-usb.c @@ -101,7 +101,7 @@ struct twl6030_usb { bool irq_enabled; }; -#define xceiv_to_twl(x) container_of((x), struct twl6030_usb, otg); +#define xceiv_to_twl(x) container_of((x), struct twl6030_usb, otg) /*-------------------------------------------------------------------------*/ |