| Message ID | 1390123794-26401-1-git-send-email-geert@linux-m68k.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Jan 19, 2014 at 10:29:54AM +0100, Geert Uytterhoeven wrote: > commit bcf24e1daa94f4c52ef7a3f657e43cc6bc50d46b ("mmc: omap_hsmmc: use the > generic config for omap2plus devices"), enabled the build for other > platforms for compile testing. > > sh-allmodconfig now fails with: > > include/linux/omap-dma.h:171:8: error: expected identifier before numeric constant > make[4]: *** [drivers/mmc/host/omap_hsmmc.o] Error 1 > > This happens because sh #defines "CCR", which is one of the enum values in > include/linux/omap-dma.h. > > I expect a similar failure on blackfin, which also has #define CCR. > > Restrict the build to ARM to fix this. This isn't the right fix. When this has happened on ARM in the past, we've had a lot of pressure to change the definition since it's far too generic. "CCR" should only be used for stuff which is restricted to (eg) one driver, and not in some system wide header file included by lots of files. In the case of OMAP, the unfortunate thing is that include/linux/omap-dma.h was moved lock stock and barrel out of the ARM-private includes. It really needs splitting up in two - one which drivers are expected to include, and the other for shared definitions between arch/arm/*omap*/dma.c and drivers/dma/omap-dma.c. Even so, "CCR" will still exist - but will be localised to the compilation units which need it. The same should happen with SH. So, as for this patch, that's a NAK.
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 7fc5099e44b2..14e94fb39164 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -284,7 +284,7 @@ config MMC_OMAP config MMC_OMAP_HS tristate "TI OMAP High Speed Multimedia Card Interface support" - depends on ARCH_OMAP2PLUS || COMPILE_TEST + depends on ARCH_OMAP2PLUS || (COMPILE_TEST && ARM) help This selects the TI OMAP High Speed Multimedia card Interface. If you have an omap2plus board with a Multimedia Card slot,
commit bcf24e1daa94f4c52ef7a3f657e43cc6bc50d46b ("mmc: omap_hsmmc: use the generic config for omap2plus devices"), enabled the build for other platforms for compile testing. sh-allmodconfig now fails with: include/linux/omap-dma.h:171:8: error: expected identifier before numeric constant make[4]: *** [drivers/mmc/host/omap_hsmmc.o] Error 1 This happens because sh #defines "CCR", which is one of the enum values in include/linux/omap-dma.h. I expect a similar failure on blackfin, which also has #define CCR. Restrict the build to ARM to fix this. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> --- http://kisskb.ellerman.id.au/kisskb/buildresult/10477672/ drivers/mmc/host/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)