From 3deb41aac902392495768c58117e297bd42fb6ab Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 17 Aug 2012 17:48:28 -0700 Subject: [PATCH] --- yaml --- r: 321887 b: refs/heads/master c: b9c4167cbbafddac3462134013bc15e63e4c53ef h: refs/heads/master i: 321885: 33c49fa5bad43255712a1ebfb67bf6356b0d053c 321883: 9ffaa9f2ba64b211bbc6e09e8b7288186c19991f 321879: 3a39c08f69c71a4eefa4a6ab5150e29bbe515f20 321871: 70a0ce4ef15fa8bba4001f70e36afb55a72a2867 321855: f16b8c1deb1c63c5241df0698213cc1dc6115e47 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/p54/p54usb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 02014f617024..b98e37b56954 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e694d518886c7afedcdd1732477832b2e32744e4 +refs/heads/master: b9c4167cbbafddac3462134013bc15e63e4c53ef diff --git a/trunk/drivers/net/wireless/p54/p54usb.c b/trunk/drivers/net/wireless/p54/p54usb.c index 7f207b6e9552..effb044a8a9d 100644 --- a/trunk/drivers/net/wireless/p54/p54usb.c +++ b/trunk/drivers/net/wireless/p54/p54usb.c @@ -42,7 +42,7 @@ MODULE_FIRMWARE("isl3887usb"); * whenever you add a new device. */ -static struct usb_device_id p54u_table[] __devinitdata = { +static struct usb_device_id p54u_table[] = { /* Version 1 devices (pci chip + net2280) */ {USB_DEVICE(0x0411, 0x0050)}, /* Buffalo WLI2-USB2-G54 */ {USB_DEVICE(0x045e, 0x00c2)}, /* Microsoft MN-710 */