Re: [PATCH 1/9] backports: fix build errors for old kernel versions without PCI support

[Hauke Mehrtens <hauke@hauke-m.de>]

On 08/02/2013 01:29 PM, Patrick Ziegler wrote:
> Signed-off-by: Patrick Ziegler <patrick.ziegler@fh-kl.de>
> ---
>  backport/compat/compat-2.6.25.c | 4 ++++
>  backport/compat/compat-2.6.28.c | 1 +
>  2 files changed, 5 insertions(+)
> 
> diff --git a/backport/compat/compat-2.6.25.c b/backport/compat/compat-2.6.25.c
> index b3597ea..169a555 100644
> --- a/backport/compat/compat-2.6.25.c
> +++ b/backport/compat/compat-2.6.25.c
> @@ -212,9 +212,13 @@ EXPORT_SYMBOL_GPL(sg_alloc_table);
>   */
>  int pci_enable_device_mem(struct pci_dev *dev)
>  {
> +#ifdef CONFIG_PCI
>  	int bars = pci_select_bars(dev, IORESOURCE_MEM);
>  
>  	return pci_enable_device_bars(dev, bars);
> +#else
> +	return 0;
> +#endif
>  }
>  EXPORT_SYMBOL_GPL(pci_enable_device_mem);
>  

I liked the older patch more where you removed the pci functions when
pci was not configured.

> diff --git a/backport/compat/compat-2.6.28.c b/backport/compat/compat-2.6.28.c
> index e47626b..2ff6b1e 100644
> --- a/backport/compat/compat-2.6.28.c
> +++ b/backport/compat/compat-2.6.28.c
> @@ -12,6 +12,7 @@
>  #include <linux/usb.h>
>  #include <linux/tty.h>
>  #include <linux/skbuff.h>
> +#include <linux/pci.h>
>  #include <asm/poll.h>
>  
>  /* 2.6.28 compat code goes here */
>