diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 19:23:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 21:20:19 +0100 |
| commit | f791be492f76dea7b0641ed227a60eeb2fa7e255 (patch) | |
| tree | 1b5348c9b5b47e0927d66cba269a441ac653e564 /drivers/mfd/cs5535-mfd.c | |
| parent | mfd: remove use of __devexit_p (diff) | |
| download | linux-f791be492f76dea7b0641ed227a60eeb2fa7e255.tar.xz linux-f791be492f76dea7b0641ed227a60eeb2fa7e255.zip | |
mfd: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Peter Tyser <ptyser@xes-inc.com>
Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
Acked-by: David Brown <davidb@codeaurora.org>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mfd/cs5535-mfd.c')
| -rw-r--r-- | drivers/mfd/cs5535-mfd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/cs5535-mfd.c b/drivers/mfd/cs5535-mfd.c index 5d3878ad39a6..0779b13a7dd1 100644 --- a/drivers/mfd/cs5535-mfd.c +++ b/drivers/mfd/cs5535-mfd.c @@ -113,7 +113,7 @@ static __devinitdata struct mfd_cell cs5535_mfd_cells[] = { }; #ifdef CONFIG_OLPC -static void __devinit cs5535_clone_olpc_cells(void) +static void cs5535_clone_olpc_cells(void) { const char *acpi_clones[] = { "olpc-xo1-pm-acpi", "olpc-xo1-sci-acpi" }; @@ -126,7 +126,7 @@ static void __devinit cs5535_clone_olpc_cells(void) static void cs5535_clone_olpc_cells(void) { } #endif -static int __devinit cs5535_mfd_probe(struct pci_dev *pdev, +static int cs5535_mfd_probe(struct pci_dev *pdev, const struct pci_device_id *id) { int err, i; |