On Sat, 2010-08-28 at 14:53 +0100, Matt Fleming wrote:
[...]
> --- a/include/linux/mmc/host.h
> +++ b/include/linux/mmc/host.h
> @@ -272,5 +272,12 @@ static inline void mmc_set_disable_delay(struct mmc_host 
> *host,
>       host->disable_delay = disable_delay;
>  }
>  
> +extern int mmc_assume_removable;

This variable is already declared in drivers/mmc/core/core.h.  Either
remove the declaration from there or define the following function there
instead of here.

> +static inline int mmc_card_is_removable(struct mmc_host *host)
> +{
> +     return (!(host->caps & MMC_CAP_NONREMOVABLE) || mmc_assume_removable);
> +}
> +

That '||' should be an '&&'.

Ben.

-- 
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to