Merge ../linux-2.6-watchdog-mm

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-pxa / pxa2xx_spi.h

diff --git a/include/asm-arm/arch-pxa/pxa2xx_spi.h b/include/asm-arm/arch-pxa/pxa2xx_spi.h
index 1e70908b816f59b1bf172c9445d294c6aab3bb81..acc7ec7a84a16614036b88c3e2c42be0c8ee865b 100644 (file)
--- a/include/asm-arm/arch-pxa/pxa2xx_spi.h
+++ b/include/asm-arm/arch-pxa/pxa2xx_spi.h
@@ -60,7 +60,7 @@ struct pxa2xx_spi_chip {
        u8 tx_threshold;
        u8 rx_threshold;
        u8 dma_burst_size;
-       u32 timeout_microsecs;
+       u32 timeout;
        u8 enable_loopback;
        void (*cs_control)(u32 command);
 };