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 /board/atmel/at91sam9260ek/at91sam9260ek.c | |
| parent | 9f23ca42b3ba19b24e66fade572f2b86d929b6e8 (diff) | |
| parent | 2d4072c06b5549444e4140231bba3d47d9b0bc53 (diff) | |
| download | u-boot-imx-3ea43ff7738582e2ed00a2ede532c702f7b1d737.zip u-boot-imx-3ea43ff7738582e2ed00a2ede532c702f7b1d737.tar.gz u-boot-imx-3ea43ff7738582e2ed00a2ede532c702f7b1d737.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/atmel/at91sam9260ek/at91sam9260ek.c')
| -rw-r--r-- | board/atmel/at91sam9260ek/at91sam9260ek.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c index c10ad72..ed47360 100644 --- a/board/atmel/at91sam9260ek/at91sam9260ek.c +++ b/board/atmel/at91sam9260ek/at91sam9260ek.c @@ -160,7 +160,7 @@ int board_init(void) at91sam9260ek_nand_hw_init(); #endif #ifdef CONFIG_HAS_DATAFLASH - at91_spi0_hw_init((1 << 0) || (1 << 1)); + at91_spi0_hw_init((1 << 0) | (1 << 1)); #endif #ifdef CONFIG_MACB at91sam9260ek_macb_hw_init(); |