| Message ID | 201306140045.51206.heiko@sntech.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Heiko Stübner wrote: > > chained_irq_enter and chained_irq_exit moved to a real header under > linux/pinctrl instead of asm/. > > Update the pinctrl driver to use the correct header and fix the build > error. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > drivers/pinctrl/pinctrl-s3c24xx.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/pinctrl/pinctrl-s3c24xx.c b/drivers/pinctrl/pinctrl- > s3c24xx.c > index c8b0399..24446da 100644 > --- a/drivers/pinctrl/pinctrl-s3c24xx.c > +++ b/drivers/pinctrl/pinctrl-s3c24xx.c > @@ -19,12 +19,11 @@ > #include <linux/irqdomain.h> > #include <linux/irq.h> > #include <linux/of_irq.h> > +#include <linux/irqchip/chained_irq.h> > #include <linux/io.h> > #include <linux/slab.h> > #include <linux/err.h> > > -#include <asm/mach/irq.h> > - > #include "pinctrl-samsung.h" > > #define NUM_EINT 24 > -- > 1.7.10.4 Hmm, would be nice if I could take 1st and 2nd into samsung tree :-) Linus, if any problems, please let me know. Thanks, - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jun 17, 2013 at 3:16 PM, Kukjin Kim <kgene.kim@samsung.com> wrote: > Heiko Stübner wrote: >> >> chained_irq_enter and chained_irq_exit moved to a real header under >> linux/pinctrl instead of asm/. >> >> Update the pinctrl driver to use the correct header and fix the build >> error. >> >> Signed-off-by: Heiko Stuebner <heiko@sntech.de> (...) > > Hmm, would be nice if I could take 1st and 2nd into samsung tree :-) > > Linus, if any problems, please let me know. No that should work fine. Nothing is touching pinctrl-s3c in my pinctrl tree so: Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 06/18/13 00:45, Linus Walleij wrote: > On Mon, Jun 17, 2013 at 3:16 PM, Kukjin Kim<kgene.kim@samsung.com> wrote: >> Heiko Stübner wrote: >>> >>> chained_irq_enter and chained_irq_exit moved to a real header under >>> linux/pinctrl instead of asm/. >>> >>> Update the pinctrl driver to use the correct header and fix the build >>> error. >>> >>> Signed-off-by: Heiko Stuebner<heiko@sntech.de> > (...) >> >> Hmm, would be nice if I could take 1st and 2nd into samsung tree :-) >> >> Linus, if any problems, please let me know. > > No that should work fine. Nothing is touching pinctrl-s3c in my > pinctrl tree so: > Acked-by: Linus Walleij<linus.walleij@linaro.org> > Thanks, applied with Linus' ack. - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pinctrl/pinctrl-s3c24xx.c b/drivers/pinctrl/pinctrl-s3c24xx.c index c8b0399..24446da 100644 --- a/drivers/pinctrl/pinctrl-s3c24xx.c +++ b/drivers/pinctrl/pinctrl-s3c24xx.c @@ -19,12 +19,11 @@ #include <linux/irqdomain.h> #include <linux/irq.h> #include <linux/of_irq.h> +#include <linux/irqchip/chained_irq.h> #include <linux/io.h> #include <linux/slab.h> #include <linux/err.h> -#include <asm/mach/irq.h> - #include "pinctrl-samsung.h" #define NUM_EINT 24
chained_irq_enter and chained_irq_exit moved to a real header under linux/pinctrl instead of asm/. Update the pinctrl driver to use the correct header and fix the build error. Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- drivers/pinctrl/pinctrl-s3c24xx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)