diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-24 01:32:42 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-24 01:32:42 -0400 |
| commit | 26e27cd424554202d36f38ee35421143788da127 (patch) | |
| tree | 04d068c76af5b636c061173465faa574d4b5e7b0 /drivers/spi/spi_butterfly.c | |
| parent | b74ba22f030eb7ab88f7d8954ad18ecc0ac5ce3c (diff) | |
| parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/spi/spi_butterfly.c')
| -rw-r--r-- | drivers/spi/spi_butterfly.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/spi_butterfly.c b/drivers/spi/spi_butterfly.c index ff9e5faa4dc9..a006a1ee27ac 100644 --- a/drivers/spi/spi_butterfly.c +++ b/drivers/spi/spi_butterfly.c | |||
| @@ -321,6 +321,7 @@ static void butterfly_attach(struct parport *p) | |||
| 321 | * (firmware resets at45, acts as spi slave) or neither (we ignore | 321 | * (firmware resets at45, acts as spi slave) or neither (we ignore |
| 322 | * both, AVR uses AT45). Here we expect firmware for the first option. | 322 | * both, AVR uses AT45). Here we expect firmware for the first option. |
| 323 | */ | 323 | */ |
| 324 | |||
| 324 | pp->info[0].max_speed_hz = 15 * 1000 * 1000; | 325 | pp->info[0].max_speed_hz = 15 * 1000 * 1000; |
| 325 | strcpy(pp->info[0].modalias, "mtd_dataflash"); | 326 | strcpy(pp->info[0].modalias, "mtd_dataflash"); |
| 326 | pp->info[0].platform_data = &flash; | 327 | pp->info[0].platform_data = &flash; |