Commit 7e368739 authored Aug 26, 2010 by Jeff Mahoney Committed by David S. Miller Aug 26, 2010

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>

parent d71b0e9c

net/caif/cfrfml.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		#include <linux/stddef.h>
		#include <linux/spinlock.h>
		#include <linux/slab.h>
		#include <linux/unaligned/le_byteshift.h>
		#include <asm/unaligned.h>
		#include <net/caif/caif_layer.h>
		#include <net/caif/cfsrvl.h>
		#include <net/caif/cfpkt.h>

Admin message