From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: David Woodhouse To: Paul Mackerras In-Reply-To: <17256.17408.247708.622755@cargo.ozlabs.ibm.com> References: <17253.39993.502458.390760@cargo.ozlabs.ibm.com> <1130861207.21212.66.camel@hades.cambridge.redhat.com> <17256.17408.247708.622755@cargo.ozlabs.ibm.com> Content-Type: text/plain Date: Wed, 02 Nov 2005 07:35:12 +0000 Message-Id: <1130916912.10031.143.camel@baythorne.infradead.org> Mime-Version: 1.0 Cc: linuxppc-dev@ozlabs.org, linuxppc64-dev@ozlabs.org Subject: Re: please pull the powerpc-merge.git tree List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Wed, 2005-11-02 at 15:43 +1100, Paul Mackerras wrote: > I also pulled in Linus' tree, and now drivers/char/tlclk.c fails to > build for some reason. I claim that's not my fault, however. :) It just needs included. That reminds me -- I needed that in platforms/chrp/pegasos_eth.c too. diff --git a/arch/powerpc/platforms/chrp/pegasos_eth.c b/arch/powerpc/platforms/chrp/pegasos_eth.c --- a/arch/powerpc/platforms/chrp/pegasos_eth.c +++ b/arch/powerpc/platforms/chrp/pegasos_eth.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #define PEGASOS2_MARVELL_REGBASE (0xf1000000) diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c --- a/drivers/char/tlclk.c +++ b/drivers/char/tlclk.c @@ -43,6 +43,7 @@ #include #include #include +#include #include /* inb/outb */ #include -- dwmw2