Nicolas Pitre
bc43fd40ea
[ARM] 4090/2: avoid clash between PXA and SA1111 defines ...
The Lubbock platform uses both a PXA25x and a SA1111 at the same time.
Both chips have the same "Serial Audio Controller" registers although
the SA1111 one is never expected to be used in preference to the PXA25x
one. So let's disable the SA1111 defines whenever compilation is for a
PXA architecture and make the PXA defines always defined.
This removes a bunch of "already defined" warnings as well since the
current hack to prevent them depended on include ordering which wasn't
always right.
While at it, clean up the SA1111 defines allowing to get rid of the
__CCREG() macro.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2007-02-17 11:27:25 +00:00
ACPI: increase ACPI_MAX_REFERENCE_COUNT for larger systems
2007-01-02 00:18:52 -05:00
[PATCH] alpha: fix epoll syscall enumerations
2007-02-03 11:26:06 -08:00
[ARM] 4090/2: avoid clash between PXA and SA1111 defines
2007-02-17 11:27:25 +00:00
[PATCH] Optimize D-cache alias handling on fork
2006-12-13 09:27:08 -08:00
[PATCH] Optimize D-cache alias handling on fork
2006-12-13 09:27:08 -08:00
[PATCH] Optimize D-cache alias handling on fork
2006-12-13 09:27:08 -08:00
[PATCH] fix frv headers_check
2007-02-01 16:17:05 -08:00
Fix Maple PATA IRQ assignment.
2007-01-26 17:27:40 -05:00
[PATCH] Optimize D-cache alias handling on fork
2006-12-13 09:27:08 -08:00
[PATCH] i386 vDSO: use VM_ALWAYSDUMP
2007-01-26 13:50:58 -08:00
ia64: add pci_get_legacy_ide_irq()
2007-01-27 13:46:54 +01:00
[PATCH] Optimize D-cache alias handling on fork
2006-12-13 09:27:08 -08:00
[PATCH] m68k: uaccess.h needs sched.h
2007-01-30 08:26:45 -08:00
[PATCH] Optimize D-cache alias handling on fork
2006-12-13 09:27:08 -08:00
[PATCH] mm: mremap correct rmap accounting
2007-01-30 08:33:32 -08:00
[ARM] pass vma for flush_anon_page()
2007-01-08 19:49:54 +00:00
[PATCH] dma-mapping.h stubs fix
2007-01-30 08:39:21 -08:00
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
2006-12-11 16:31:42 +11:00
[PATCH] FD_ZERO build fix
2007-01-11 18:18:22 -08:00
[PATCH] Optimize D-cache alias handling on fork
2006-12-13 09:27:08 -08:00
[PATCH] Optimize D-cache alias handling on fork
2006-12-13 09:27:08 -08:00
[SPARC32]: Fix over-optimization by GCC near ip_fast_csum.
2007-02-01 20:24:35 -08:00
[SPARC64]: Fix of_iounmap() region release.
2006-12-31 14:06:05 -08:00
[PATCH] uml-i386: fix build breakage with CONFIG_HIGHMEM
2007-02-01 16:17:06 -08:00
[PATCH] Optimize D-cache alias handling on fork
2006-12-13 09:27:08 -08:00
[PATCH] x86-64: define dma noncoherent API functions
2007-02-03 11:26:06 -08:00
[PATCH] FD_ZERO build fix
2007-01-11 18:18:22 -08:00
[CRYPTO] lib: table driven multiplications in GF(2^128)
2006-12-06 18:38:55 -08:00
[ARM] 4137/1: Add kexec support
2007-02-16 14:37:06 +00:00
V4L/DVB (5001): Add two required headers on kernel 2.6.20-rc1
2006-12-27 14:20:46 -02:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
2006-10-01 17:55:53 +01:00
[TCP]: Restore SKB socket owner setting in tcp_transmit_skb().
2007-01-26 01:04:55 -08:00
[PATCH] pcmcia: multifunction card handling fixes
2006-12-04 20:09:15 -05:00
IB: Fix ib_dma_alloc_coherent() wrapper
2006-12-15 13:57:26 -08:00
[PATCH] slab: remove kmem_cache_t
2006-12-07 08:39:25 -08:00
[PATCH] ALSA: Fix sysfs breakage
2007-01-29 14:32:53 -08:00
[PATCH] sstfb: add sysfs interface
2006-12-13 09:05:55 -08:00
bc43fd40ea