Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[~andy/linux] / drivers / spi / spi_mpc8xxx.c

diff --git a/drivers/spi/spi_mpc8xxx.c b/drivers/spi/spi_mpc8xxx.c
index 394b6581e17fd95c821c71d8522e1b8de3a36998..e9390d747bfcf35e018747fcfc6a1b2e529ef486 100644 (file)
--- a/drivers/spi/spi_mpc8xxx.c
+++ b/drivers/spi/spi_mpc8xxx.c
@@ -163,11 +163,6 @@ struct mpc8xxx_spi {
        u32 tx_shift;           /* TX data reg shift when in qe mode */
 
        unsigned int flags;
-#define SPI_QE_CPU_MODE                (1 << 0) /* QE CPU ("PIO") mode */
-#define SPI_CPM_MODE           (1 << 1) /* CPM/QE ("DMA") mode */
-#define SPI_CPM1               (1 << 2) /* SPI unit is in CPM1 block */
-#define SPI_CPM2               (1 << 3) /* SPI unit is in CPM2 block */
-#define SPI_QE                 (1 << 4) /* SPI unit is in QE block */
 
        struct workqueue_struct *workqueue;
        struct work_struct work;
@@ -1361,7 +1356,7 @@ static int __devexit plat_mpc8xxx_spi_remove(struct platform_device *pdev)
 MODULE_ALIAS("platform:mpc8xxx_spi");
 static struct platform_driver mpc8xxx_spi_driver = {
        .probe = plat_mpc8xxx_spi_probe,
-       .remove = __exit_p(plat_mpc8xxx_spi_remove),
+       .remove = __devexit_p(plat_mpc8xxx_spi_remove),
        .driver = {
                .name = "mpc8xxx_spi",
                .owner = THIS_MODULE,