bbs.cooldavid.org Git - net-next-2.6.git/commit

author	Namhyung Kim <namhyung@gmail.com>
	Mon, 25 Oct 2010 05:52:38 +0000 (05:52 +0000)
committer	David S. Miller <davem@davemloft.net>
	Tue, 26 Oct 2010 16:25:54 +0000 (09:25 -0700)
commit	516723215ca1f9bce154e3dcec71234ee3650343
tree	7d8501326f24bdd18d1879839a56c18b7f9f8d02	tree \| snapshot (tar.bz2 tar.gz zip)
parent	502279a7cd1e4b1d320ee2c9a25eca165232d213	commit \| diff

sparc32: fix build failure on CONFIG_SPARC_LEON

CC arch/sparc/kernel/irq_32.o
arch/sparc/kernel/irq_32.c: In function 'request_fast_irq':
arch/sparc/kernel/irq_32.c:370:25: error: conflicting types for 'trapbase_cpu1'
arch/sparc/include/asm/leon.h:366:22: note: previous declaration of 'trapbase_cpu1' was here
arch/sparc/kernel/irq_32.c:370:40: error: conflicting types for 'trapbase_cpu2'
arch/sparc/include/asm/leon.h:367:22: note: previous declaration of 'trapbase_cpu2' was here
arch/sparc/kernel/irq_32.c:370:55: error: conflicting types for 'trapbase_cpu3'
arch/sparc/include/asm/leon.h:368:22: note: previous declaration of 'trapbase_cpu3' was here
make[3]: *** [arch/sparc/kernel/irq_32.o] Error 1
make[2]: *** [arch/sparc/kernel] Error 2
make[1]: *** [sub-make] Error 2
make: *** [all] Error 2

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>