Merge branch 'next' into for-linus

[pandora-kernel.git] / include / linux / mfd / htc-pasic3.h

diff --git a/include/linux/mfd/htc-pasic3.h b/include/linux/mfd/htc-pasic3.h
index b4294f1..3d3ed67 100644 (file)
--- a/include/linux/mfd/htc-pasic3.h
+++ b/include/linux/mfd/htc-pasic3.h
@@ -48,7 +48,6 @@ struct pasic3_leds_machinfo {
 
 struct pasic3_platform_data {
        struct pasic3_leds_machinfo *led_pdata;
-       unsigned int                 bus_shift;
        unsigned int                 clock_rate;
 };