diff options
Diffstat (limited to 'drivers/w1/masters/mxc_w1.c')
-rw-r--r-- | drivers/w1/masters/mxc_w1.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c index 65244c02551b..a3b6a74c67a7 100644 --- a/drivers/w1/masters/mxc_w1.c +++ b/drivers/w1/masters/mxc_w1.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
23 | #include <linux/clk.h> | 23 | #include <linux/clk.h> |
24 | #include <linux/slab.h> | ||
24 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
25 | #include <linux/io.h> | 26 | #include <linux/io.h> |
26 | 27 | ||
@@ -102,7 +103,7 @@ static u8 mxc_w1_ds2_touch_bit(void *data, u8 bit) | |||
102 | return ((__raw_readb(ctrl_addr)) >> 3) & 0x1; | 103 | return ((__raw_readb(ctrl_addr)) >> 3) & 0x1; |
103 | } | 104 | } |
104 | 105 | ||
105 | static int __init mxc_w1_probe(struct platform_device *pdev) | 106 | static int __devinit mxc_w1_probe(struct platform_device *pdev) |
106 | { | 107 | { |
107 | struct mxc_w1_device *mdev; | 108 | struct mxc_w1_device *mdev; |
108 | struct resource *res; | 109 | struct resource *res; |
@@ -166,7 +167,7 @@ failed_clk: | |||
166 | /* | 167 | /* |
167 | * disassociate the w1 device from the driver | 168 | * disassociate the w1 device from the driver |
168 | */ | 169 | */ |
169 | static int mxc_w1_remove(struct platform_device *pdev) | 170 | static int __devexit mxc_w1_remove(struct platform_device *pdev) |
170 | { | 171 | { |
171 | struct mxc_w1_device *mdev = platform_get_drvdata(pdev); | 172 | struct mxc_w1_device *mdev = platform_get_drvdata(pdev); |
172 | struct resource *res; | 173 | struct resource *res; |