drm/radeon/kms/evergreen: set accel_enabled

[safe/jmp/linux-2.6] / drivers / mfd / menelaus.c

diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 4b364ba..a3fb4bc 100644 (file)
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -40,11 +40,12 @@
 #include <linux/delay.h>
 #include <linux/rtc.h>
 #include <linux/bcd.h>
+#include <linux/slab.h>
 
 #include <asm/mach/irq.h>
 
 #include <mach/gpio.h>
-#include <mach/menelaus.h>
+#include <plat/menelaus.h>
 
 #define DRIVER_NAME                    "menelaus"
 
@@ -1237,7 +1238,6 @@ static int __exit menelaus_remove(struct i2c_client *client)
 
        free_irq(client->irq, menelaus);
        kfree(menelaus);
-       i2c_set_clientdata(client, NULL);
        the_menelaus = NULL;
        return 0;
 }