Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S263452AbUAEPlu (ORCPT ); Mon, 5 Jan 2004 10:41:50 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S265144AbUAEPlt (ORCPT ); Mon, 5 Jan 2004 10:41:49 -0500 Received: from fed1mtao01.cox.net ([68.6.19.244]:44018 "EHLO fed1mtao01.cox.net") by vger.kernel.org with ESMTP id S263452AbUAEPls (ORCPT ); Mon, 5 Jan 2004 10:41:48 -0500 Date: Mon, 5 Jan 2004 08:41:47 -0700 From: Tom Rini To: Geert Uytterhoeven Cc: David Mueller , Linux/PPC Development , Linux Kernel Development Subject: Re: PPC32: Fix the floppy driver, on CONFIG_NOT_COHERENT_CACHE. Message-ID: <20040105154146.GB2415@stop.crashing.org> References: <200401032002.i03K25Y9024335@hera.kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.4i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1802 Lines: 50 On Mon, Jan 05, 2004 at 03:04:47PM +0100, Geert Uytterhoeven wrote: > On Fri, 2 Jan 2004, Linux Kernel Mailing List wrote: > > ChangeSet 1.1356.1.2, 2004/01/02 08:51:54-07:00, trini@kernel.crashing.org > > > > PPC32: Fix the floppy driver, on CONFIG_NOT_COHERENT_CACHE. > > From David Mueller . > > > > > > # This patch includes the following deltas: > > # ChangeSet 1.1356.1.1 -> 1.1356.1.2 > > # include/asm-ppc/floppy.h 1.5 -> 1.6 > > # > > > > floppy.h | 6 +++++- > > 1 files changed, 5 insertions(+), 1 deletion(-) > > > > > > diff -Nru a/include/asm-ppc/floppy.h b/include/asm-ppc/floppy.h > > --- a/include/asm-ppc/floppy.h Sat Jan 3 12:02:06 2004 > > +++ b/include/asm-ppc/floppy.h Sat Jan 3 12:02:06 2004 > > @@ -12,7 +12,7 @@ > > #define __ASM_PPC_FLOPPY_H > > > > #define fd_inb(port) inb_p(port) > > -#define fd_outb(port,value) outb_p(port,value) > > +#define fd_outb(value,port) outb_p(value,port) > > > > #define fd_enable_dma() enable_dma(FLOPPY_DMA) > > #define fd_disable_dma() disable_dma(FLOPPY_DMA) > > @@ -24,7 +24,11 @@ > > #define fd_set_dma_count(count) set_dma_count(FLOPPY_DMA,count) > > #define fd_enable_irq() enable_irq(FLOPPY_IRQ) > > #define fd_disable_irq() disable_irq(FLOPPY_IRQ) > > +#if CONFIG_NOT_COHERENT_CACHE > ^^^ > Shouldn't this be #ifdef? Yes, but I don't believe that any gcc that you're supposed to use on 2.4 complains about that... ... not a good way to start a week. :) -- Tom Rini http://gate.crashing.org/~trini/ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/