diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-28 02:04:00 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-28 02:04:00 +0200 |
| commit | fbd1a04b210d56ef84200df56fc0291746d4d4dc (patch) | |
| tree | d3e963a13fb2c027129c9342a204a430b88c2f90 /drivers | |
| parent | Merge tag 'davinci-for-v3.11/dt' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | gpio: msm-v1: Remove errant __devinit to fix compile (diff) | |
| download | linux-fbd1a04b210d56ef84200df56fc0291746d4d4dc.tar.xz linux-fbd1a04b210d56ef84200df56fc0291746d4d4dc.zip | |
Merge branch 'msm/fixes' into next/late
Merging in msm/fixes to avoid silly conflicts at top level.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/gpio-msm-v1.c | 2 | ||||
| -rw-r--r-- | drivers/ssbi/ssbi.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-msm-v1.c b/drivers/gpio/gpio-msm-v1.c index c798585a3fe5..fb2cc90d0134 100644 --- a/drivers/gpio/gpio-msm-v1.c +++ b/drivers/gpio/gpio-msm-v1.c @@ -630,7 +630,7 @@ static struct irq_chip msm_gpio_irq_chip = { .irq_set_type = msm_gpio_irq_set_type, }; -static int __devinit gpio_msm_v1_probe(struct platform_device *pdev) +static int gpio_msm_v1_probe(struct platform_device *pdev) { int i, j = 0; const struct platform_device_id *dev_id = platform_get_device_id(pdev); diff --git a/drivers/ssbi/ssbi.c b/drivers/ssbi/ssbi.c index f32da0258a8e..e561d3be54a5 100644 --- a/drivers/ssbi/ssbi.c +++ b/drivers/ssbi/ssbi.c @@ -350,6 +350,7 @@ static struct of_device_id ssbi_match_table[] = { { .compatible = "qcom,ssbi" }, {} }; +MODULE_DEVICE_TABLE(of, ssbi_match_table); static struct platform_driver ssbi_driver = { .probe = ssbi_probe, |