diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-14 15:12:21 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-14 15:12:21 -0700 |
| commit | 0eb78fe0413724e5f018e9cbcea471550de6111c (patch) | |
| tree | 525c8db5137cf16e9b605974bf5df6b112a43463 /usb | |
| parent | 6f6c2037b7b488100fff438e172b08e91ccf95d8 (diff) | |
| download | patches-0eb78fe0413724e5f018e9cbcea471550de6111c.tar.gz | |
2.6.31-git2 resync
delete some patches as well.
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-gadget-add-eem-gadget-driver.patch | 6 | ||||
| -rw-r--r-- | usb/usb-gadget-update-freescale-udc-entry-in-maintainers.patch | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usb/usb-gadget-add-eem-gadget-driver.patch b/usb/usb-gadget-add-eem-gadget-driver.patch index 5320efadae9bbf..b7c27f41bfb043 100644 --- a/usb/usb-gadget-add-eem-gadget-driver.patch +++ b/usb/usb-gadget-add-eem-gadget-driver.patch @@ -900,7 +900,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> break; /* software-driven interface shutdown */ -@@ -536,14 +562,15 @@ static int eth_start_xmit(struct sk_buff +@@ -537,14 +563,15 @@ static netdev_tx_t eth_start_xmit(struct * or there's not enough space for extra headers we need */ if (dev->wrap) { @@ -921,7 +921,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> length = skb->len; } req->buf = skb->data; -@@ -577,9 +604,9 @@ static int eth_start_xmit(struct sk_buff +@@ -578,9 +605,9 @@ static netdev_tx_t eth_start_xmit(struct } if (retval) { @@ -932,7 +932,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> spin_lock_irqsave(&dev->req_lock, flags); if (list_empty(&dev->tx_reqs)) netif_start_queue(net); -@@ -752,6 +779,8 @@ int __init gether_setup(struct usb_gadge +@@ -753,6 +780,8 @@ int __init gether_setup(struct usb_gadge INIT_LIST_HEAD(&dev->tx_reqs); INIT_LIST_HEAD(&dev->rx_reqs); diff --git a/usb/usb-gadget-update-freescale-udc-entry-in-maintainers.patch b/usb/usb-gadget-update-freescale-udc-entry-in-maintainers.patch index 914bcbe45c3727..25f1a70a6238c7 100644 --- a/usb/usb-gadget-update-freescale-udc-entry-in-maintainers.patch +++ b/usb/usb-gadget-update-freescale-udc-entry-in-maintainers.patch @@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2067,12 +2067,12 @@ S: Supported +@@ -2069,12 +2069,12 @@ S: Supported F: arch/powerpc/sysdev/qe_lib/ F: arch/powerpc/include/asm/*qe.h |