From: Johannes Berg Date: Mon, 1 Apr 2013 22:14:48 +0000 (+0200) Subject: fix backported fw loader X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=80a07fc92a581e413eab8d72590d951150be3231;p=openwrt%2Fstaging%2Fblogic.git fix backported fw loader Signed-off-by: Johannes Berg --- diff --git a/compat/compat/Kconfig b/compat/compat/Kconfig index 76e32c350875..8d2b3f2071d2 100644 --- a/compat/compat/Kconfig +++ b/compat/compat/Kconfig @@ -38,7 +38,7 @@ config BACKPORT_BUILD_FW_LOADER tristate - default m if BACKPORT_FW_LOADER && !FW_LOADER + default m if BACKPORT_FW_LOADER && (!FW_LOADER || BACKPORT_KERNEL_2_6_33) config BACKPORT_FW_LOADER bool diff --git a/compat/include/linux/compat-2.6.33.h b/compat/include/linux/compat-2.6.33.h index c0be190e02ba..29305fded4ac 100644 --- a/compat/include/linux/compat-2.6.33.h +++ b/compat/include/linux/compat-2.6.33.h @@ -32,12 +32,12 @@ static inline void usb_autopm_put_interface_no_suspend(struct usb_interface *int } #endif /* CONFIG_USB_SUSPEND */ -#if defined(CONFIG_COMPAT_FIRMWARE_CLASS) +#if defined(CPTCFG_BACKPORT_BUILD_FW_LOADER_MODULE) #define request_firmware_nowait LINUX_BACKPORT(request_firmware_nowait) #define request_firmware LINUX_BACKPORT(request_firmware) #define release_firmware LINUX_BACKPORT(release_firmware) -#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE) +#if defined(CPTCFG_COMPAT_FW_LOADER) int request_firmware(const struct firmware **fw, const char *name, struct device *device); int request_firmware_nowait(