From 02f1b4e19e9b23578d1859ff75986f98fcf68a49 Mon Sep 17 00:00:00 2001 From: Barry Song Date: Wed, 26 Dec 2012 10:48:34 +0800 Subject: [PATCH] --- yaml --- r: 350764 b: refs/heads/master c: f3b8a8ecc5922d9dff303ae2fadc1eae608a6f7c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi-sirf.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index be291d0ca796..86a046cb90ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5118cd2c2881db18a92eec68d1b29db9bcbcaf3 +refs/heads/master: f3b8a8ecc5922d9dff303ae2fadc1eae608a6f7c diff --git a/trunk/drivers/spi/spi-sirf.c b/trunk/drivers/spi/spi-sirf.c index 1f04979492aa..6a5626d146b7 100644 --- a/trunk/drivers/spi/spi-sirf.c +++ b/trunk/drivers/spi/spi-sirf.c @@ -658,6 +658,7 @@ static const struct dev_pm_ops spi_sirfsoc_pm_ops = { static const struct of_device_id spi_sirfsoc_of_match[] = { { .compatible = "sirf,prima2-spi", }, + { .compatible = "sirf,marco-spi", }, {} }; MODULE_DEVICE_TABLE(of, sirfsoc_spi_of_match);