From: Christoph Hellwig <hch@lst.de>
To: kou.ishizaki@toshiba.co.jp
Cc: linuxppc-dev@ozlabs.org, cbe-oss-dev@ozlabs.org
Subject: [PATCH] fix celleb link failure
Date: Tue, 15 May 2007 15:09:40 +0200 [thread overview]
Message-ID: <20070515130940.GA11544@lst.de> (raw)
txx9_serial_init calls early_serial_txx9_setup which is only available
if CONFIG_SERIAL_TXX9_CONSOLE is define. From looking at scc_sio.c
it seems like the whole file is only needed for
CONFIG_SERIAL_TXX9_CONSOLE=y, so we should only build it for that case.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: linux-2.6.20/arch/powerpc/platforms/celleb/Makefile
===================================================================
--- linux-2.6.20.orig/arch/powerpc/platforms/celleb/Makefile 2007-05-15 14:42:15.000000000 +0200
+++ linux-2.6.20/arch/powerpc/platforms/celleb/Makefile 2007-05-15 14:42:31.000000000 +0200
@@ -4,5 +4,5 @@ obj-y += interrupt.o iommu.o setup.o
obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_PPC_UDBG_BEAT) += udbg_beat.o
-obj-$(CONFIG_HAS_TXX9_SERIAL) += scc_sio.o
+obj-$(CONFIG_SERIAL_TXX9_CONSOLE) += scc_sio.o
obj-$(CONFIG_SPU_BASE) += spu_priv1.o
Index: linux-2.6.20/arch/powerpc/platforms/celleb/scc_sio.c
===================================================================
--- linux-2.6.20.orig/arch/powerpc/platforms/celleb/scc_sio.c 2007-05-15 14:40:49.000000000 +0200
+++ linux-2.6.20/arch/powerpc/platforms/celleb/scc_sio.c 2007-05-15 14:42:47.000000000 +0200
@@ -65,9 +65,7 @@ static int txx9_serial_init(void)
req.line = i;
req.iotype = UPIO_MEM;
req.mapbase = res.start + txx9_scc_tab[i].offset;
-#ifdef CONFIG_SERIAL_TXX9_CONSOLE
req.membase = ioremap(req.mapbase, 0x24);
-#endif
req.irq = irq_create_of_mapping(irq.controller,
irq.specifier, irq.size);
req.flags |= UPF_IOREMAP | UPF_BUGGY_UART /*HAVE_CTS_LINE*/;
next reply other threads:[~2007-05-15 13:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-15 13:09 Christoph Hellwig [this message]
2007-05-16 7:14 ` [PATCH] fix celleb link failure Ishizaki Kou
2007-05-16 10:37 ` Christoph Hellwig
2007-05-21 7:28 ` Ishizaki Kou
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=20070515130940.GA11544@lst.de \
--to=hch@lst.de \
--cc=cbe-oss-dev@ozlabs.org \
--cc=kou.ishizaki@toshiba.co.jp \
--cc=linuxppc-dev@ozlabs.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.