libceph: move r_reply_op_{len,result} into struct ceph_osd_req_op

[linux-2.6-block.git] / drivers / power / bq2415x_charger.c

diff --git a/drivers/power/bq2415x_charger.c b/drivers/power/bq2415x_charger.c
index 27e89536689aa1d9de6d359808a827c3822e432f..73e2f0b79dd4f9c67c8c4f70a5d596f46bfe4cb7 100644 (file)
--- a/drivers/power/bq2415x_charger.c
+++ b/drivers/power/bq2415x_charger.c
@@ -1759,6 +1759,7 @@ static const struct i2c_device_id bq2415x_i2c_id_table[] = {
 };
 MODULE_DEVICE_TABLE(i2c, bq2415x_i2c_id_table);
 
+#ifdef CONFIG_ACPI
 static const struct acpi_device_id bq2415x_i2c_acpi_match[] = {
        { "BQ2415X", BQUNKNOWN },
        { "BQ241500", BQ24150 },
@@ -1776,10 +1777,31 @@ static const struct acpi_device_id bq2415x_i2c_acpi_match[] = {
        {},
 };
 MODULE_DEVICE_TABLE(acpi, bq2415x_i2c_acpi_match);
+#endif
+
+#ifdef CONFIG_OF
+static const struct of_device_id bq2415x_of_match_table[] = {
+       { .compatible = "ti,bq24150" },
+       { .compatible = "ti,bq24150a" },
+       { .compatible = "ti,bq24151" },
+       { .compatible = "ti,bq24151a" },
+       { .compatible = "ti,bq24152" },
+       { .compatible = "ti,bq24153" },
+       { .compatible = "ti,bq24153a" },
+       { .compatible = "ti,bq24155" },
+       { .compatible = "ti,bq24156" },
+       { .compatible = "ti,bq24156a" },
+       { .compatible = "ti,bq24157s" },
+       { .compatible = "ti,bq24158" },
+       {},
+};
+MODULE_DEVICE_TABLE(of, bq2415x_of_match_table);
+#endif
 
 static struct i2c_driver bq2415x_driver = {
        .driver = {
                .name = "bq2415x-charger",
+               .of_match_table = of_match_ptr(bq2415x_of_match_table),
                .acpi_match_table = ACPI_PTR(bq2415x_i2c_acpi_match),
        },
        .probe = bq2415x_probe,