aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2013-02-08 00:19:11 +0000
committerBen Hutchings <ben@decadent.org.uk>2013-02-20 03:15:35 +0000
commit386e01c13c41a0d773b698f9863dea0e4d11c387 (patch)
treecfb9314f86766aeb0dddf57a230dfe97db4a66bf /net/sctp
parentbf4f81cd04a2db72cea6f15b41df71b3f6e8dfd6 (diff)
downloadkernel_samsung_smdk4412-386e01c13c41a0d773b698f9863dea0e4d11c387.zip
kernel_samsung_smdk4412-386e01c13c41a0d773b698f9863dea0e4d11c387.tar.gz
kernel_samsung_smdk4412-386e01c13c41a0d773b698f9863dea0e4d11c387.tar.bz2
atm/iphase: rename fregt_t -> ffreg_t
[ Upstream commit ab54ee80aa7585f9666ff4dd665441d7ce41f1e8 ] 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.carstens@de.ibm.com> Acked-by: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/sctp')
0 files changed, 0 insertions, 0 deletions