From: Greg Kroah-Hartman Date: Wed, 20 Dec 2006 19:46:03 +0000 (-0800) Subject: USB Storage: remove duplicate Nokia entry in unusual_devs.h X-Git-Tag: v2.6.20-rc2~83^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c3052905033f8785bcb2c71d5ce40b84259e3a80;p=linux-2.6-omap-h63xx.git USB Storage: remove duplicate Nokia entry in unusual_devs.h How many times are we going to merge this entry... Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index f726b87c8fe..5fe7ff441a0 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h @@ -160,13 +160,6 @@ UNUSUAL_DEV( 0x0421, 0x0433, 0x0100, 0x0100, US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ), -/* Reported by */ -UNUSUAL_DEV( 0x0421, 0x0433, 0x0100, 0x0100, - "Nokia", - "E70", - US_SC_DEVICE, US_PR_DEVICE, NULL, - US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ), - /* Reported by Jon Hart */ UNUSUAL_DEV( 0x0421, 0x0434, 0x0100, 0x0100, "Nokia",