From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Thu, 10 Jun 2010 21:51:51 +0000 (-0700)
Subject: USB: option: Remove duplicate AMOI_VENDOR_ID
X-Git-Tag: v2.6.36-rc1~293^2~125
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f37bca1038de01ab2666adde1954460c35ff3af;p=pandora-kernel.git

USB: option: Remove duplicate AMOI_VENDOR_ID

AMOI_VENDOR_ID is defined twice.  Remove the duplicate entry and move
the AMOI_PRODUCT_9508 definition to be grouped with the other AMOI
product definitions.

Originally-by: Ben Collins <ben.collins@ubuntu.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

Reading git-diff-tree failed