Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 294164
b: refs/heads/master
c: abc0cce
h: refs/heads/master
v: v3
  • Loading branch information
Mark Brown committed Feb 22, 2012
1 parent b626a34 commit d964112
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 027d676650e690c6bcb479d96fb601e91213ee56
refs/heads/master: abc0cceaeeab6d3101f4d9492063a4e4ae813b85
4 changes: 2 additions & 2 deletions trunk/drivers/mfd/wm8994-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ static int wm8994_ldo_in_use(struct wm8994_pdata *pdata, int ldo)
/*
* Instantiate the generic non-control parts of the device.
*/
static int wm8994_device_init(struct wm8994 *wm8994, int irq)
static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq)
{
struct wm8994_pdata *pdata = wm8994->dev->platform_data;
struct regmap_config *regmap_config;
Expand Down Expand Up @@ -580,7 +580,7 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
return ret;
}

static void wm8994_device_exit(struct wm8994 *wm8994)
static __devexit void wm8994_device_exit(struct wm8994 *wm8994)
{
pm_runtime_disable(wm8994->dev);
mfd_remove_devices(wm8994->dev);
Expand Down

0 comments on commit d964112

Please sign in to comment.