On Thu, 06 Mar 2008 15:17:13 -0600 James Bottomley wrote:
> We could do it that way ... I suspect what Greg was asking for was more
> like this:
>
> James
Builds cleanly for CONFIG_FW_LOADER=n.
I'm having trouble setting CONFIG_FW_LOADER=m for test building it.
Anyway,
Acked-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
> ---
>
> diff --git a/include/linux/firmware.h b/include/linux/firmware.h
> index 33d8f20..4d10c73 100644
> --- a/include/linux/firmware.h
> +++ b/include/linux/firmware.h
> @@ -10,7 +10,10 @@ struct firmware {
> size_t size;
> u8 *data;
> };
> +
> struct device;
> +
> +#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
> int request_firmware(const struct firmware **fw, const char *name,
> struct device *device);
> int request_firmware_nowait(
> @@ -19,4 +22,24 @@ int request_firmware_nowait(
> void (*cont)(const struct firmware *fw, void *context));
>
> void release_firmware(const struct firmware *fw);
> +#else
> +static inline int request_firmware(const struct firmware **fw,
> + const char *name,
> + struct device *device)
> +{
> + return -EINVAL;
> +}
> +static inline int request_firmware_nowait(
> + struct module *module, int uevent,
> + const char *name, struct device *device, void *context,
> + void (*cont)(const struct firmware *fw, void *context))
> +{
> + return -EINVAL;
> +}
> +
> +static inline void release_firmware(const struct firmware *fw)
> +{
> +}
> +#endif
> +
> #endif
---
~Randy
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
