Merge branch 'for-3.8/core' of git://git.kernel.dk/linux-block

[~andy/linux] / arch / arm / mach-spear13xx / spear13xx.c

diff --git a/arch/arm/mach-spear13xx/spear13xx.c b/arch/arm/mach-spear13xx/spear13xx.c
index 5633d698f1e189c29d04eb09f8f18276f9d85b73..c4af775a8451a6067f5c4c8ecb30ef1da2d902f8 100644 (file)
--- a/arch/arm/mach-spear13xx/spear13xx.c
+++ b/arch/arm/mach-spear13xx/spear13xx.c
@@ -57,12 +57,10 @@ static struct dw_dma_slave ssp_dma_param[] = {
 };
 
 struct pl022_ssp_controller pl022_plat_data = {
-       .bus_id = 0,
        .enable_dma = 1,
        .dma_filter = dw_dma_filter,
        .dma_rx_param = &ssp_dma_param[1],
        .dma_tx_param = &ssp_dma_param[0],
-       .num_chipselect = 3,
 };
 
 /* CF device registration */