diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-21 22:56:52 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-21 22:56:52 -0700 |
commit | 04ef037c926ddb31088c976538e29eada4fd1490 (patch) | |
tree | 763e287ee2e7203d3b5e7e6b4d696e7989008a51 /drivers/pinctrl/pinctrl-samsung.c | |
parent | 78901d05e727a0eb28209e9210a92078af3117f2 (diff) | |
parent | d3c977927bd6320f1e9d4098989d6001bdcefc09 (diff) | |
download | linux-04ef037c926ddb31088c976538e29eada4fd1490.tar.gz linux-04ef037c926ddb31088c976538e29eada4fd1490.tar.bz2 linux-04ef037c926ddb31088c976538e29eada4fd1490.zip |
Merge branch 'samsung/pinctrl' into next/drivers
A few fixups for the samsung pinctrl series
* samsung/pinctrl:
pinctrl: exynos: Fix wakeup IRQ domain registration check
pinctrl: samsung: Uninline samsung_pinctrl_get_soc_data
pinctrl: exynos: Correct the detection of wakeup-eint node
pinctrl: exynos: Mark exynos_irq_demux_eint as inline
pinctrl: exynos: Handle only unmasked wakeup interrupts
pinctrl: exynos: Fix typos in gpio/wkup _irq_mask
pinctrl: exynos: Set pin function to EINT in irq_set_type of GPIO EINTa
Diffstat (limited to 'drivers/pinctrl/pinctrl-samsung.c')
-rw-r--r-- | drivers/pinctrl/pinctrl-samsung.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-samsung.c b/drivers/pinctrl/pinctrl-samsung.c index 8a24223d5334..dd108a94acf9 100644 --- a/drivers/pinctrl/pinctrl-samsung.c +++ b/drivers/pinctrl/pinctrl-samsung.c @@ -776,7 +776,7 @@ static int __init samsung_gpiolib_unregister(struct platform_device *pdev, static const struct of_device_id samsung_pinctrl_dt_match[]; /* retrieve the soc specific data */ -static inline struct samsung_pin_ctrl *samsung_pinctrl_get_soc_data( +static struct samsung_pin_ctrl *samsung_pinctrl_get_soc_data( struct platform_device *pdev) { int id; |