If a pre-2.6.33 kernel has backported suitable firmware loader functionality, then it doesn't need the compat_firmware_class. In that case, compat-2.6.33 should not redefine the *_firmware function names. Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx> --- include/linux/compat-2.6.33.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/linux/compat-2.6.33.h b/include/linux/compat-2.6.33.h index 539b469..e9e888a 100644 --- a/include/linux/compat-2.6.33.h +++ b/include/linux/compat-2.6.33.h @@ -14,9 +14,11 @@ #endif #include <linux/firmware.h> +#if defined(CONFIG_COMPAT_FIRMWARE_CLASS) #define release_firmware compat_release_firmware #define request_firmware compat_request_firmware #define request_firmware_nowait compat_request_firmware_nowait +#endif #if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE) int compat_request_firmware(const struct firmware **fw, const char *name, -- 1.7.4.4 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
