diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-01-17 22:49:59 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-01-17 22:49:59 -0500 |
| commit | d65177c1ae7f085723154105c5dc8d9e16ae8265 (patch) | |
| tree | 14408129d880d89cc5e937f2810f243ed1e6fcde /drivers/usb/gadget/inode.c | |
| parent | d41f084a74de860fe879403fbbad13abdf7aea8e (diff) | |
| parent | 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/usb/gadget/inode.c')
| -rw-r--r-- | drivers/usb/gadget/inode.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c index c6c279de832e..9a4edc5657aa 100644 --- a/drivers/usb/gadget/inode.c +++ b/drivers/usb/gadget/inode.c | |||
| @@ -1738,9 +1738,6 @@ static struct usb_gadget_driver gadgetfs_driver = { | |||
| 1738 | 1738 | ||
| 1739 | .driver = { | 1739 | .driver = { |
| 1740 | .name = (char *) shortname, | 1740 | .name = (char *) shortname, |
| 1741 | // .shutdown = ... | ||
| 1742 | // .suspend = ... | ||
| 1743 | // .resume = ... | ||
| 1744 | }, | 1741 | }, |
| 1745 | }; | 1742 | }; |
| 1746 | 1743 | ||