diff --git a/[refs] b/[refs] index 6d09925fa192..00f7f49d24be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5d228158e77998a1659c1783fb204f275fab93b +refs/heads/master: c6eda6c5eeb357ff231121619fb49d2bc0605faf diff --git a/trunk/drivers/gpio/tc35892-gpio.c b/trunk/drivers/gpio/tc35892-gpio.c index 7e10c935a047..027b857c18ff 100644 --- a/trunk/drivers/gpio/tc35892-gpio.c +++ b/trunk/drivers/gpio/tc35892-gpio.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include /* * These registers are modified under the irq bus lock and cached to avoid diff --git a/trunk/drivers/mfd/tc35892.c b/trunk/drivers/mfd/tc35892.c index e619e2a55997..f230235c3765 100644 --- a/trunk/drivers/mfd/tc35892.c +++ b/trunk/drivers/mfd/tc35892.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include /** * tc35892_reg_read() - read a single TC35892 register diff --git a/trunk/include/linux/mfd/tc35892.h b/trunk/include/linux/mfd/tc3589x.h similarity index 100% rename from trunk/include/linux/mfd/tc35892.h rename to trunk/include/linux/mfd/tc3589x.h