| commit | c488637cf0e028ed7973614ee708f94b4dc9c16e | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Sep 15 17:28:07 2011 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Sep 15 17:28:07 2011 +0200 |
| tree | f0ef60051548821e02f8dae8d969e1e90d9c30da | |
| parent | 72cc205611879525db0374d9831f84f787112b25 [diff] | |
| parent | d03c35939d2a447093e60133156217d6512aa9e3 [diff] |
Merge branch 'samsung-fixes-2' of git://github.com/kgene/linux-samsung into HEAD
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c index 83dce85..a9e0dae 100644 --- a/arch/arm/mach-dove/common.c +++ b/arch/arm/mach-dove/common.c
@@ -158,7 +158,7 @@ void __init dove_spi1_init(void) { - orion_spi_init(DOVE_SPI1_PHYS_BASE, get_tclk()); + orion_spi_1_init(DOVE_SPI1_PHYS_BASE, get_tclk()); } /*****************************************************************************