Commit:     a1e3cf418fc1e6b13bdc472ffb60bd02735e41a6
Parent:     e7498281d3caec1141d7542ec494c4e4a1d404c9
Author:     Haavard Skinnemoen <[EMAIL PROTECTED]>
AuthorDate: Wed May 9 02:33:50 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed May 9 12:30:50 2007 -0700

    atmel_spi: remove unnecessary (and wrong) #ifdefs
    Now that the cpu_is_xxx() macros are available both on AVR32 and AT91, we 
    remove a couple of #ifdefs from this driver.  One of them is actually wrong 
    new_1 should be set on AVR32 but isn't.  This causes the bus clock to run at
    twice the speed it is configured to.
    Signed-off-by: Haavard Skinnemoen <[EMAIL PROTECTED]>
    Cc: David Brownell <[EMAIL PROTECTED]>
    Acked-by: Andrew Victor <[EMAIL PROTECTED]>
    Cc: Nicolas Ferre <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 drivers/spi/atmel_spi.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 66e7bc9..1d8a2f6 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -22,10 +22,7 @@
 #include <asm/io.h>
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>
-#ifdef CONFIG_ARCH_AT91
 #include <asm/arch/cpu.h>
 #include "atmel_spi.h"
@@ -552,10 +549,8 @@ static int __init atmel_spi_probe(struct platform_device 
                goto out_free_buffer;
        as->irq = irq;
        as->clk = clk;
-#ifdef CONFIG_ARCH_AT91
        if (!cpu_is_at91rm9200())
                as->new_1 = 1;
        ret = request_irq(irq, atmel_spi_interrupt, 0,
                        pdev->dev.bus_id, master);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to