backports.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Patrick Ziegler <patrick.ziegler@fh-kl.de>
To: "Luis R. Rodriguez" <mcgrof@kernel.org>
Cc: <backports@vger.kernel.org>
Subject: [RFC v3 1/9] backports: fix build errors for old kernel versions without PCI support
Date: Thu, 1 Aug 2013 17:59:00 +0200	[thread overview]
Message-ID: <51FA85C4.4060400@fh-kl.de> (raw)
In-Reply-To: <cover.1375372668.git.patrick.ziegler@fh-kl.de>

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);
 
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 */
-- 
1.8.1.2



-- 
Dipl.-Inf. (FH) Patrick Ziegler

University Of Applied Sciences
Kaiserslautern

Amerikastrasse 1
D-66482 Zweibruecken
Germany

Phone:  +49 631 3724 5526
Mail:   patrick.ziegler@fh-kl.de
PGP KeyID 0xB4796B8C

http://www.fh-kl.de
http://www.fh-kl.de/fachbereiche/imst/iuk-knowhow.html

       reply	other threads:[~2013-08-01 15:59 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <cover.1375372668.git.patrick.ziegler@fh-kl.de>
2013-08-01 15:59 ` Patrick Ziegler [this message]
2013-08-01 15:59 ` [RFC v3 2/9] backports: add eth_prepare_mac_addr_change() and eth_commit_mac_addr_change() Patrick Ziegler
2013-08-01 17:00   ` Luis R. Rodriguez
2013-08-01 15:59 ` [RFC v3 3/9] backports: define PM_EVENT_AUTO Patrick Ziegler
2013-08-01 15:59 ` [RFC v3 4/9] backports: add usb_translate_errors() Patrick Ziegler
2013-08-01 15:59 ` [RFC v3 5/9] backports: add usb_endpoint_maxp() Patrick Ziegler
2013-08-01 15:59 ` [RFC v3 7/9] backports: include headers directly if math64 header is missing Patrick Ziegler
2013-08-01 16:00 ` [RFC v3 8/9] backports: define phys_addr_t for ARM on kernel version < 2.6.25 Patrick Ziegler
2013-08-01 16:00 ` [RFC v3 9/9] backports: add wwan device drivers Patrick Ziegler
2013-08-01 16:00 ` [RFC v3 6/9] backports: update enum usb_device_speed with USB_SPEED_SUPER Patrick Ziegler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=51FA85C4.4060400@fh-kl.de \
    --to=patrick.ziegler@fh-kl.de \
    --cc=backports@vger.kernel.org \
    --cc=mcgrof@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).