Looks like I managed to break the x86 build for some

configs. Here's a fix for that on top of the pinctrl
 changes already merged with the signed tag
 omap-for-v3.13/quirk-signed.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJSYcuYAAoJEBvUPslcq6Vz9GsQAIIehLrVNmAy+xljClhd9zjY
 U77PPuhh8Iy3AtjrGVIJAv9Cz8vev+LFV9DYY0m52FrwmLS01lk4HmMMkQfBrs+S
 22C1mMwmZFHQg7PNBkZTzpqHFGPgbF4jso9v/UN0GQkvhqSHgQ3kHyT1Hh99aiTx
 GmFRiriTIjImemfcvpCvRPtuO2r4XXwF2gQ2QJp/OVNxW53gpV19BSJMGQ4eBeye
 M09IGjWQiW1O97nyYvUcLmEupL+kDNKwhhL3L54q4f4NrLAwPXRPEqdn5NbbhMyO
 aCuupfD2JuObGqHKXq3dIgrX2XLOX2+rHOeCVBY9tZLrRPvf8JdM9ZGiSBJN3PBL
 JKzEs8jVRvz8r4/BF/U9WEbU+P0e7NNjeemiIUPG3sXGUjX3ByeECLArTIAHr49h
 5ve/daVaSro6AJ+xZQHBWpZY22KJnkw4DC0t/8c7GtA7el4HhTNsjwxJOh9WVpOY
 UhTCGPN2cAEs78EQ9X4dzdihoNX9oU3WC+U/1kg4enUkPO2RF2BkrpN9JF2doRTe
 jHK46aVFsKAZSvTVnwxBoOIUagM2mOdk3x/QKUCUwol9jqxFQhTgUJfsWt1z+8vl
 F94WPk6maGVOOF4P10kI9ErBapl+vIorNbJ/KFshFSkdKpuDvAXUhKqjydKYJMfs
 nbEKnkqMToHd925O1jlX
 =KNnl
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.13/pinctrl-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

From Tony Lindgren:

Looks like I managed to break the x86 build for some
configs. Here's a fix for that on top of the pinctrl
changes already merged with the signed tag
omap-for-v3.13/quirk-signed.

* tag 'omap-for-v3.13/pinctrl-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  pinctrl: single: Fix build when not built on ARM

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2013-10-18 17:30:19 -07:00
commit 1e819b3ed3

View file

@ -1747,7 +1747,12 @@ static int pcs_irqdomain_map(struct irq_domain *d, unsigned int irq,
irq_set_chip_data(irq, pcs_soc); irq_set_chip_data(irq, pcs_soc);
irq_set_chip_and_handler(irq, &pcs->chip, irq_set_chip_and_handler(irq, &pcs->chip,
handle_level_irq); handle_level_irq);
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
#ifdef CONFIG_ARM
set_irq_flags(irq, IRQF_VALID);
#else
irq_set_noprobe(irq);
#endif
return 0; return 0;
} }