diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-07-19 11:34:42 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-07-19 11:34:42 +0400 |
| commit | e43fff2b98b4e99b189c086a9cf740b19eaf3538 (patch) | |
| tree | 658a5f73d5806fe47856547b17cbd23592856c62 /net/caif/caif_usb.c | |
| parent | 67516844625f45f0ce148a01c27bf41f591872b2 (diff) | |
| parent | ecb2cf1a6b63825a258ff4fe0d7f3070fbe4676b (diff) | |
| download | linux-e43fff2b98b4e99b189c086a9cf740b19eaf3538.tar.xz | |
Merge branch 'linus' into perf/core
Merge in a v3.11-rc1-ish branch to go from v3.10 based development
to a v3.11 based one.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/caif/caif_usb.c')
| -rw-r--r-- | net/caif/caif_usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/caif/caif_usb.c b/net/caif/caif_usb.c index 942e00a425fd..75ed04b78fa4 100644 --- a/net/caif/caif_usb.c +++ b/net/caif/caif_usb.c @@ -121,9 +121,9 @@ static struct packet_type caif_usb_type __read_mostly = { }; static int cfusbl_device_notify(struct notifier_block *me, unsigned long what, - void *arg) + void *ptr) { - struct net_device *dev = arg; + struct net_device *dev = netdev_notifier_info_to_dev(ptr); struct caif_dev_common common; struct cflayer *layer, *link_support; struct usbnet *usbnet; |