diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2008-08-18 17:43:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-16 09:24:47 -0700 |
| commit | 8a1ce2c0447b1a0816f66fde2f832c31b5fbee2c (patch) | |
| tree | f443998c3dcc9c8c9741fcfc92b9719cd1fef748 /drivers/usb/gadget/u_ether.c | |
| parent | 352e2b961c885b98065c402e2ad85057d0a334b2 (diff) | |
| download | blackbird-op-linux-8a1ce2c0447b1a0816f66fde2f832c31b5fbee2c.tar.gz blackbird-op-linux-8a1ce2c0447b1a0816f66fde2f832c31b5fbee2c.zip | |
usb gadget: link fixes for cdc composite gadget
Change how the CDC Composite gadget driver builds: don't
use separate compilation, since it works poorly when key
parts are library code (with init sections etc). Instead
be as close as we can to "gcc --combine ...".
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/u_ether.c')
| -rw-r--r-- | drivers/usb/gadget/u_ether.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c index 3791e6271903..dbd575a194f3 100644 --- a/drivers/usb/gadget/u_ether.c +++ b/drivers/usb/gadget/u_ether.c @@ -52,7 +52,7 @@ * this single "physical" link to be used by multiple virtual links.) */ -#define DRIVER_VERSION "29-May-2008" +#define UETH__VERSION "29-May-2008" struct eth_dev { /* lock is held while accessing port_usb @@ -170,7 +170,7 @@ static void eth_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *p) struct eth_dev *dev = netdev_priv(net); strlcpy(p->driver, "g_ether", sizeof p->driver); - strlcpy(p->version, DRIVER_VERSION, sizeof p->version); + strlcpy(p->version, UETH__VERSION, sizeof p->version); strlcpy(p->fw_version, dev->gadget->name, sizeof p->fw_version); strlcpy(p->bus_info, dev_name(&dev->gadget->dev), sizeof p->bus_info); } |
