From cba57eb7d55923b74ed8c7d1dd97ecf98b7bba77 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 7 Mar 2011 12:18:55 +0200 Subject: [PATCH] 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 Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer --- Reading git-format-patch failed