diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/usb/gadget/net2280.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/usb/gadget/net2280.c')
| -rw-r--r-- | drivers/usb/gadget/net2280.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c index d09155b25d73..24696f7fa6a9 100644 --- a/drivers/usb/gadget/net2280.c +++ b/drivers/usb/gadget/net2280.c | |||
| @@ -117,7 +117,7 @@ module_param (fifo_mode, ushort, 0644); | |||
| 117 | 117 | ||
| 118 | /* enable_suspend -- When enabled, the driver will respond to | 118 | /* enable_suspend -- When enabled, the driver will respond to |
| 119 | * USB suspend requests by powering down the NET2280. Otherwise, | 119 | * USB suspend requests by powering down the NET2280. Otherwise, |
| 120 | * USB suspend requests will be ignored. This is acceptible for | 120 | * USB suspend requests will be ignored. This is acceptable for |
| 121 | * self-powered devices | 121 | * self-powered devices |
| 122 | */ | 122 | */ |
| 123 | static int enable_suspend = 0; | 123 | static int enable_suspend = 0; |