]> git.baikalelectronics.ru Git - kernel.git/commit
net/caif/cfrfml.c: use asm/unaligned.h
authorJeff Mahoney <jeffm@suse.com>
Thu, 26 Aug 2010 23:11:08 +0000 (16:11 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 26 Aug 2010 23:11:08 +0000 (16:11 -0700)
commit81f281243e7d2ccda6d396f57c4a296582f9a00f
tree29d4adeaa18b4c6a60ceb219280cebb911443507
parentacd84b6aebe8736c71bbe7cb8b8ef8a00330b55d
net/caif/cfrfml.c: use asm/unaligned.h

caif does not build on ia64 starting with 2.6.32-rc1.  Using
asm/unaligned.h instead of linux/unaligned/le_byteshift.h fixes the issue.

include/linux/unaligned/le_byteshift.h:40:50: error: redefinition of 'get_unaligned_le16'
include/linux/unaligned/le_byteshift.h:45:50: error: redefinition of 'get_unaligned_le32'
include/linux/unaligned/le_byteshift.h:50:50: error: redefinition of 'get_unaligned_le64'
include/linux/unaligned/le_byteshift.h:55:51: error: redefinition of 'put_unaligned_le16'
include/linux/unaligned/le_byteshift.h:60:51: error: redefinition of 'put_unaligned_le32'
include/linux/unaligned/le_byteshift.h:65:51: error: redefinition of 'put_unaligned_le64'
include/linux/unaligned/le_struct.h:31:51: note: previous definition of 'put_unaligned_le64' was here

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/caif/cfrfml.c