Fixed ISR definition conflict in the XPLAIN bridge between the software UART and...

[pub/lufa.git] / LUFA / Drivers / Peripheral / SPI.h

diff --git a/LUFA/Drivers/Peripheral/SPI.h b/LUFA/Drivers/Peripheral/SPI.h
index 5bd7df4..8c38dcc 100644 (file)
--- a/LUFA/Drivers/Peripheral/SPI.h
+++ b/LUFA/Drivers/Peripheral/SPI.h
@@ -113,7 +113,7 @@
                        #define SPI_MODE_MASTER                (1 << MSTR)
 
                /* Inline Functions: */
-                       /** Initializes the SPI subsystem, ready for transfers. Must be called before calling any other
+                       /** Initialises the SPI subsystem, ready for transfers. Must be called before calling any other
                         *  SPI routines.
                         *
                         *  \param[in] SPIOptions  SPI Options, a mask consisting of one of each of the SPI_SPEED_*,
@@ -122,6 +122,7 @@
                        static inline void SPI_Init(const uint8_t SPIOptions)
                        {
                                DDRB  |= ((1 << 1) | (1 << 2));
+                               DDRB  &= ((1 << 0) | (1 << 3));
                                PORTB |= ((1 << 0) | (1 << 3));
                                
                                SPCR   = ((1 << SPE) | SPIOptions);