diff -uprN -X linux-2.6.32.3/Documentation/dontdiff linux-2.6.32.3-vanilla/drivers/spi/atmel_spi.c linux-2.6.32.3/drivers/spi/atmel_spi.c
--- linux-2.6.32.3-vanilla/drivers/spi/atmel_spi.c	2010-01-06 17:07:45.000000000 -0600
+++ linux-2.6.32.3/drivers/spi/atmel_spi.c	2010-09-08 13:38:52.000000000 -0500
@@ -768,7 +768,7 @@ static int __init atmel_spi_probe(struct
 	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
 
 	master->bus_num = pdev->id;
-	master->num_chipselect = 4;
+	master->num_chipselect = 7;
 	master->setup = atmel_spi_setup;
 	master->transfer = atmel_spi_transfer;
 	master->cleanup = atmel_spi_cleanup;