diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-09-07 23:12:46 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-09-07 23:12:46 +0200 |
| commit | 3ea43ff7738582e2ed00a2ede532c702f7b1d737 (patch) | |
| tree | 4377a47f1c3df1a1f8d899975756a02acc807486 /cpu/arm926ejs/at91/at91sam9260_devices.c | |
| parent | 9f23ca42b3ba19b24e66fade572f2b86d929b6e8 (diff) | |
| parent | 2d4072c06b5549444e4140231bba3d47d9b0bc53 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'cpu/arm926ejs/at91/at91sam9260_devices.c')
| -rw-r--r-- | cpu/arm926ejs/at91/at91sam9260_devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/arm926ejs/at91/at91sam9260_devices.c b/cpu/arm926ejs/at91/at91sam9260_devices.c index 5309ba282a..f86cb99da6 100644 --- a/cpu/arm926ejs/at91/at91sam9260_devices.c +++ b/cpu/arm926ejs/at91/at91sam9260_devices.c @@ -75,7 +75,7 @@ void at91_serial_hw_init(void) #endif } -#ifdef CONFIG_HAS_DATAFLASH +#if defined(CONFIG_HAS_DATAFLASH) || defined(CONFIG_ATMEL_SPI) void at91_spi0_hw_init(unsigned long cs_mask) { at91_set_A_periph(AT91_PIN_PA0, 0); /* SPI0_MISO */ |