Search Linux Wireless

Re: [PATCH 2/2] compat: fix compile errors with CONFIG_FW_LOADER unset

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, Jan 18, 2010 at 03:30:14PM +0100, Felix Fietkau wrote:
> Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
> ---
> --- a/compat/compat_firmware_class.c
> +++ b/compat/compat_firmware_class.c
> @@ -20,6 +20,8 @@
>  #include <linux/highmem.h>
>  #include <linux/firmware.h>
>  
> +#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
> +
>  #define to_dev(obj) container_of(obj, struct device, kobj)
>  
>  MODULE_AUTHOR("Manuel Estrada Sainz");
> @@ -724,3 +726,5 @@ module_exit(firmware_class_exit);
>  EXPORT_SYMBOL(release_firmware);
>  EXPORT_SYMBOL(request_firmware);
>  EXPORT_SYMBOL(request_firmware_nowait);
> +
> +#endif

Hm, that would end up still building the compat_firmware module though,
what about something like this? This is not tested on a system without
FW_LOADER  yet, not sure if it works:

diff --git a/Makefile b/Makefile
index 4843869..ad8a602 100644
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,13 @@ $(foreach ver,$(COMPAT_VERSIONS),$(eval export CONFIG_COMPAT_KERNEL_$(ver)=y))
 endif
 
 ifeq ($(CONFIG_COMPAT_KERNEL_33),y)
+ifeq ($(CONFIG_FW_LOADER),y)
  export CONFIG_COMPAT_FIRMWARE_CLASS=m
 endif
+ifeq ($(CONFIG_FW_LOADER_MODULE),y)
+ export CONFIG_COMPAT_FIRMWARE_CLASS=m
+endif
+endif
 
 obj-y += compat/
 

Oh well this is just for compat.git but we'd do something similar on config.mk
Testing to build compat.git should suffice though I think.

  Luis
--
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

[Index of Archives]     [Linux Host AP]     [ATH6KL]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Linux Kernel]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Device Mapper]
  Powered by Linux