Merge tag 'for-linus-v3.10-rc1' of git://oss.sgi.com/xfs/xfs

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / mips / include / asm / mach-bcm63xx / bcm63xx_dev_spi.h

diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
index c9bae13..b0184cf 100644 (file)
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
@@ -13,7 +13,6 @@ struct bcm63xx_spi_pdata {
        unsigned int    msg_ctl_width;
        int             bus_num;
        int             num_chipselect;
-       u32             speed_hz;
 };
 
 enum bcm63xx_regs_spi {