All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wojtek Kaniewski <wojtekka@toxygen.net>
To: linux-kernel@vger.kernel.org
Subject: [PATCH] ppc4xx: Compilation fixes for PCI-less configs
Date: Wed, 25 Oct 2006 23:44:56 +0200	[thread overview]
Message-ID: <453FDAD8.7040809@toxygen.net> (raw)

Fix compilation without PCI support for Bubinga, CPCI405 and EP405.
bios_fixup() for these boards uses functions available only with
CONFIG_PCI, so linker fails.

Signed-Off-By: Wojtek Kaniewski <wojtekka@toxygen.net>

--- linux-2.6.19-rc3.orig/arch/ppc/platforms/4xx/bubinga.c	2006-10-25 22:29:35.000000000 +0200
+++ linux-2.6.19-rc3/arch/ppc/platforms/4xx/bubinga.c	2006-10-25 23:12:09.000000000 +0200
@@ -116,6 +116,7 @@
 void __init
 bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
 {
+#ifdef CONFIG_PCI

 	unsigned int bar_response, bar;
 	/*
@@ -212,6 +213,7 @@
 	printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la)));

 #endif
+#endif
 }

 void __init
--- linux-2.6.19-rc3.orig/arch/ppc/platforms/4xx/cpci405.c	2006-10-25 22:29:35.000000000 +0200
+++ linux-2.6.19-rc3/arch/ppc/platforms/4xx/cpci405.c	2006-10-25 22:54:55.000000000 +0200
@@ -126,6 +126,7 @@
 void __init
 bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
 {
+#ifdef CONFIG_PCI
 	unsigned int bar_response, bar;

 	/* Disable region first */
@@ -167,6 +168,7 @@
 					PCI_FUNC(hose->first_busno), bar,
 					&bar_response);
 	}
+#endif
 }

 void __init
--- linux-2.6.19-rc3.orig/arch/ppc/platforms/4xx/ep405.c	2006-10-25 22:29:35.000000000 +0200
+++ linux-2.6.19-rc3/arch/ppc/platforms/4xx/ep405.c	2006-10-25 23:01:20.000000000 +0200
@@ -68,6 +68,7 @@
 void __init
 bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
 {
+#ifdef CONFIG_PCI
 	unsigned int bar_response, bar;
 	/*
 	 * Expected PCI mapping:
@@ -130,6 +131,7 @@
 		    PCI_FUNC(hose->first_busno), bar, bar_response);
 	}
 	/* end work arround */
+#endif
 }

 void __init

                 reply	other threads:[~2006-10-25 21:46 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=453FDAD8.7040809@toxygen.net \
    --to=wojtekka@toxygen.net \
    --cc=linux-kernel@vger.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.