diff --git a/[refs] b/[refs] index 5c8373bf77da..e0024fe17e97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 253ca923281aec6975ec4028ddbc58e865d8d13d +refs/heads/master: 7fe89e9cc8ebd9da70f760409a4301d26f80a460 diff --git a/trunk/drivers/usb/core/otg_whitelist.h b/trunk/drivers/usb/core/otg_whitelist.h index 627a5a2fc9cf..7f31a495a25d 100644 --- a/trunk/drivers/usb/core/otg_whitelist.h +++ b/trunk/drivers/usb/core/otg_whitelist.h @@ -31,7 +31,7 @@ static struct usb_device_id whitelist_table [] = { { USB_DEVICE_INFO(7, 1, 3) }, #endif -#ifdef CONFIG_USB_CDCETHER +#ifdef CONFIG_USB_NET_CDCETHER /* Linux-USB CDC Ethernet gadget */ { USB_DEVICE(0x0525, 0xa4a1), }, /* Linux-USB CDC Ethernet + RNDIS gadget */