From 320acf6496caa5dec4e8edddc4004c11f03a1607 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 9 Jul 2012 22:29:00 +0800 Subject: [PATCH] --- yaml --- r: 319758 b: refs/heads/master c: 2984fc0093268cfffd39725a70078396c5fdef2a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/max77686.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 64cc8c83d923..e3d66ffefcf1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2985c29c196418b8f666bc9240c922aa56bff599 +refs/heads/master: 2984fc0093268cfffd39725a70078396c5fdef2a diff --git a/trunk/drivers/mfd/max77686.c b/trunk/drivers/mfd/max77686.c index 3e31d05906b2..c03e12b51924 100644 --- a/trunk/drivers/mfd/max77686.c +++ b/trunk/drivers/mfd/max77686.c @@ -34,11 +34,6 @@ #define I2C_ADDR_RTC (0x0C >> 1) -static struct of_device_id __devinitdata max77686_pmic_dt_match[] = { - {.compatible = "maxim,max77686", .data = 0}, - {}, -}; - static struct mfd_cell max77686_devs[] = { { .name = "max77686-pmic", }, { .name = "max77686-rtc", }, @@ -50,6 +45,11 @@ static struct regmap_config max77686_regmap_config = { }; #ifdef CONFIG_OF +static struct of_device_id __devinitdata max77686_pmic_dt_match[] = { + {.compatible = "maxim,max77686", .data = 0}, + {}, +}; + static struct max77686_platform_data *max77686_i2c_parse_dt_pdata(struct device *dev) {