From: Arnd Bergmann Date: Tue, 4 Jun 2013 14:46:00 +0000 (+0200) Subject: USB: OHCI: remove bogus #error X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~78^2~71 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=358e91175cac9398b152ad9adc2391ebce34011c;p=pandora-kernel.git USB: OHCI: remove bogus #error The OHCI host controller driver can be built standalone now, without enabling any of the available bus glue drivers, so there is not really a reason to error out here: drivers/usb/host/ohci-hcd.c:1258: error: #error "missing bus glue for ohci-hcd" #error "missing bus glue for ohci-hcd" This follows the same change done in ehci recently as 843e56c0 "USB: EHCI: remove bogus #error" and hopefully avoids future merge conflicts in this list. Signed-off-by: Arnd Bergmann Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed