From: chas williams - CONTRACTOR <c...@cmf.nrl.navy.mil> Date: Fri, 8 Feb 2013 09:58:42 -0500
> On Fri, 8 Feb 2013 11:19:11 +0100 > Heiko Carstens <heiko.carst...@de.ibm.com> wrote: > >> We have conflicting type qualifiers for "freg_t" in s390's ptrace.h and the >> iphase atm device driver, which causes the compile error below. >> Unfortunately the s390 typedef can't be renamed, since it's a user visible >> api, >> nor can I change the include order in s390 code to avoid the conflict. >> >> So simply rename the iphase typedef to a new name. Fixes this compile error: >> >> In file included from drivers/atm/iphase.c:66:0: >> drivers/atm/iphase.h:639:25: error: conflicting type qualifiers for 'freg_t' >> In file included from next/arch/s390/include/asm/ptrace.h:9:0, >> from next/arch/s390/include/asm/lowcore.h:12, >> from next/arch/s390/include/asm/thread_info.h:30, >> from include/linux/thread_info.h:54, >> from include/linux/preempt.h:9, >> from include/linux/spinlock.h:50, >> from include/linux/seqlock.h:29, >> from include/linux/time.h:5, >> from include/linux/stat.h:18, >> from include/linux/module.h:10, >> from drivers/atm/iphase.c:43: >> next/arch/s390/include/uapi/asm/ptrace.h:197:3: note: previous declaration >> of 'freg_t' was here >> >> Signed-off-by: Heiko Carstens <heiko.carst...@de.ibm.com> > > seems like a fine idea. > > Acked-by: chas williams - CONTRACTOR <c...@cmf.nrl.navy.mil> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
