git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 164f7b5) | patch
ARM: imx/mx25: fix (again) spi device registration typo
authorBaruch Siach <baruch@tkos.co.il>
Mon, 7 Mar 2011 10:18:55 +0000 (12:18 +0200)
committerSascha Hauer <s.hauer@pengutronix.de>
Tue, 8 Mar 2011 12:24:23 +0000 (13:24 +0100)
commitcba57eb7d55923b74ed8c7d1dd97ecf98b7bba77
treeb67026dd1dc4f5a72ce08a4776fc725ca22aec41tree | snapshot
parent164f7b5237cca2701dd2943928ec8d078877a28dcommit | diff
ARM: imx/mx25: fix (again) spi device registration typo

This typo was fixed in 46e3f30 (mx25: fix spi device registration typo), but a
the merge at 0e44e059 (Merge commit 'v2.6.37-rc4' into imx-for-2.6.38) resolved
the merge conflict wrongly.

Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
arch/arm/mach-imx/devices-imx25.h diff | blob | history
Pandora Kernel Repository