Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / include / linux / spi / spi.h

diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index e928c0d..c8bb680 100644 (file)
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -642,10 +642,14 @@ struct spi_board_info {
        u16             bus_num;
        u16             chip_select;
 
+       /* mode becomes spi_device.mode, and is essential for chips
+        * where the default of SPI_CS_HIGH = 0 is wrong.
+        */
+       u8              mode;
+
        /* ... may need additional spi_device chip config data here.
         * avoid stuff protocol drivers can set; but include stuff
         * needed to behave without being bound to a driver:
-        *  - chipselect polarity
         *  - quirks like clock rate mattering when not selected
         */
 };