1 --- a/arch/arm/mach-bcm2708/bcm2708.c
2 +++ b/arch/arm/mach-bcm2708/bcm2708.c
3 @@ -559,7 +559,6 @@ static struct platform_device bcm2708_sp
5 #ifdef CONFIG_BCM2708_SPIDEV
6 static struct spi_board_info bcm2708_spi_devices[] = {
7 -#ifdef CONFIG_SPI_SPIDEV
10 .max_speed_hz = 500000,
11 @@ -573,7 +572,6 @@ static struct spi_board_info bcm2708_spi
19 --- a/arch/arm/mach-bcm2709/bcm2709.c
20 +++ b/arch/arm/mach-bcm2709/bcm2709.c
21 @@ -581,7 +581,6 @@ static struct platform_device bcm2708_sp
23 #ifdef CONFIG_BCM2708_SPIDEV
24 static struct spi_board_info bcm2708_spi_devices[] = {
25 -#ifdef CONFIG_SPI_SPIDEV
28 .max_speed_hz = 500000,
29 @@ -595,7 +594,6 @@ static struct spi_board_info bcm2708_spi