-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Somebody in the thread at some point said: | EINT group macro produces an error. | Fix this by giving correct macro arguments. | | Signed-off-by: Matt Hsu <[email protected]> | --- | arch/arm/plat-s3c64xx/include/plat/irqs.h | 2 +- | 1 files changed, 1 insertions(+), 1 deletions(-) | | diff --git a/arch/arm/plat-s3c64xx/include/plat/irqs.h b/arch/arm/plat-s3c64xx/include/plat/irqs.h | index b850852..9af66c9 100644 | --- a/arch/arm/plat-s3c64xx/include/plat/irqs.h | +++ b/arch/arm/plat-s3c64xx/include/plat/irqs.h | @@ -192,7 +192,7 @@ | #define IRQ_EINT_GROUP8_BASE (IRQ_EINT_GROUP7_BASE + IRQ_EINT_GROUP7_NR) | #define IRQ_EINT_GROUP9_BASE (IRQ_EINT_GROUP8_BASE + IRQ_EINT_GROUP8_NR) | | -#define IRQ_EINT_GROUP(group, no) (IRQ_EINT_GROUP##group##__BASE + (x)) | +#define IRQ_EINT_GROUP(group, no) (IRQ_EINT_GROUP##group##_BASE + (no)) | | /* Set the default NR_IRQS */ |
I was going to put this on pending-tracking, but I see Ben has taken it already so I'll get it in a rebase I guess. The following changes since commit 9e42d0cf5020aaf217433cad1a224745241d212a: ~ Linus Torvalds (1): ~ Merge git://git.kernel.org/.../davem/sparc-2.6 are available in the git repository at: ~ git://aeryn.fluff.org.uk/bjdooks/linux.git next-s3c-fixes Ben Dooks (3): ~ [ARM] S3C24XX: Add gpio_to_irq() facility ~ [ARM] S3C24XX: Add gpio_to_irq implementation ~ [ARM] Ensure CONFIG_SERIAL_SAMSUNG_UARTS is always set. Matt Hsu (1): ~ [ARM] S3C64XX: Fix EINT group macro definition ~ arch/arm/mach-s3c2410/include/mach/gpio.h | 1 + ~ arch/arm/plat-s3c24xx/gpiolib.c | 18 ++++++++++++++++++ ~ arch/arm/plat-s3c64xx/include/plat/irqs.h | 2 +- ~ drivers/serial/Kconfig | 2 +- ~ 4 files changed, 21 insertions(+), 2 deletions(-) - -Andy -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org iEYEARECAAYFAklmO6QACgkQOjLpvpq7dMor4gCfR68A+jw+pkakFzwiL8VkVGwy kmIAoJDl+woD0R0TIP9bEXO23/jRrNEF =Ot+H -----END PGP SIGNATURE-----
