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
..
arch-aaec2000
[ARM] Clean up discontigmem support
2006-11-30 22:52:28 +00:00
arch-at91rm9200
[ARM] 4086/1: AT91: Whitespace cleanup
2007-01-24 11:59:55 +00:00
arch-cl7500
Don't include linux/config.h from anywhere else in include/
2006-04-26 12:56:16 +01:00
arch-clps711x
[ARM] Clean up discontigmem support
2006-11-30 22:52:28 +00:00
arch-ebsa110
[ARM] ebsa110: fix warnings generated by asm/arch/io.h
2006-11-20 15:59:10 +00:00
arch-ebsa285
fix file specification in comments
2006-10-03 23:01:26 +02:00
arch-ep93xx
[ARM] 4063/1: ep93xx: fix IRQ_EP93XX_GPIO?MUX numbering
2006-12-30 17:05:06 +00:00
arch-h720x
fix file specification in comments
2006-10-03 23:01:26 +02:00
arch-imx
[ARM] 4171/1: i.MX/MX1 optimize interrupt source retrieval
2007-02-16 12:58:43 +00:00
arch-integrator
[ARM] 3631/1: Remove legacy __mem_isa() definitions
2006-06-24 10:34:48 +01:00
arch-iop13xx
[ARM] 4077/1: iop13xx: fix __io() macro
2006-12-30 17:05:08 +00:00
arch-iop32x
[ARM] 4082/1: iop3xx: fix iop33x gpio register offset
2007-01-06 12:43:59 +00:00
arch-iop33x
[ARM] 3832/1: iop3xx: coding style cleanup
2006-09-25 10:25:53 +01:00
arch-ixp4xx
[ARM] 4033/1: Add separate Avila board setup code
2007-02-06 16:46:46 +00:00
arch-ixp23xx
[ARM] 4057/1: ixp23xx: unconditionally enable hardware coherency
2006-12-18 00:14:59 +00:00
arch-ixp2000
[ARM] Fix decompressor serial IO to give CRLF not LFCR
2006-03-28 10:24:33 +01:00
arch-l7200
[ARM] Remove "translated" io macros
2006-11-30 14:39:14 +00:00
arch-lh7a40x
[ARM] Clean up discontigmem support
2006-11-30 22:52:28 +00:00
arch-netx
[ARM] 3631/1: Remove legacy __mem_isa() definitions
2006-06-24 10:34:48 +01:00
arch-omap
WorkQueue: Fix up arch-specific work items where possible
2006-12-05 19:36:26 +00:00
arch-pnx4008
i2c: New Philips PNX bus driver
2006-12-10 21:21:29 +01:00
arch-pxa
[ARM] 4090/2: avoid clash between PXA and SA1111 defines
2007-02-17 11:27:25 +00:00
arch-realview
[ARM] oprofile: add ARM11 SMP support
2007-02-06 16:46:45 +00:00
arch-rpc
[ARM] Move FLUSH_BASE macros to asm/arch/memory.h
2006-04-07 13:22:21 +01:00
arch-s3c2410
[ARM] 4106/1: S3C2410: typo fixes in register definitions
2007-01-24 12:04:17 +00:00
arch-sa1100
[ARM] Merge individual ARM sub-trees
2006-12-07 23:07:26 +00:00
arch-shark
fix file specification in comments
2006-10-03 23:01:26 +02:00
arch-versatile
[PATCH] arm-versatile iomem annotations
2006-10-11 11:17:06 -07:00
hardware
[ARM] 4090/2: avoid clash between PXA and SA1111 defines
2007-02-17 11:27:25 +00:00
mach
[ARM] Remove compatibility layer for ARM irqs
2006-11-30 12:24:47 +00:00
.gitignore
[ARM] 4216/1: add .gitignore entries for ARM specific files
2007-02-17 11:26:41 +00:00
a.out.h
apm.h
Don't include linux/config.h from anywhere else in include/
2006-04-26 12:56:16 +01:00
assembler.h
[ARM] Remove MODE_(SVC|IRQ|FIQ|USR) and DEFAULT_FIQ
2006-06-25 12:01:48 +01:00
atomic.h
[ARM] 3810/1: switch atomic helpers over to raw_local_irq_{save,restore}
2006-09-25 10:25:24 +01:00
auxvec.h
bitops.h
[ARM] 3852/1: convert atomic bitops and __xchg over to raw_local_irq_{save,restore}
2006-09-25 10:34:03 +01:00
bug.h
[ARM] 3983/2: remove unused argument to __bug()
2006-12-07 22:38:09 +00:00
bugs.h
[ARM] nommu: adjust headers for !MMU ARM systems
2006-06-28 17:59:45 +01:00
byteorder.h
[ARM] Fix byte order macros for Thumb
2006-06-19 15:35:36 +01:00
cache.h
[PATCH] Kill L1_CACHE_SHIFT_MAX
2006-01-08 20:13:39 -08:00
cacheflush.h
[ARM] Resolve fuse and direct-IO failures due to missing cache flushes
2007-01-08 19:49:58 +00:00
checksum.h
[ARM] Improve csum_fold, cleanup csum_tcpudp_magic()
2007-02-06 16:46:46 +00:00
cnt32_to_63.h
[ARM] 3978/1: macro to provide a 63-bit value from a 32-bit hardware counter
2006-12-07 16:06:45 +00:00
cpu-multi32.h
[ARM] Unuse another Linux PTE bit
2006-12-13 14:34:43 +00:00
cpu-single.h
[ARM] Unuse another Linux PTE bit
2006-12-13 14:34:43 +00:00
cpu.h
Don't include linux/config.h from anywhere else in include/
2006-04-26 12:56:16 +01:00
cputime.h
current.h
delay.h
[ARM] 3346/1: Fix udelay() for HZ values different from 100
2006-03-21 22:06:07 +00:00
device.h
[ARM] Add a reference from struct device to the dma bounce info
2007-02-12 10:28:24 +00:00
div64.h
[ARM] 3611/4: optimize do_div() when divisor is constant
2006-12-07 16:06:09 +00:00
dma-mapping.h
[ARM] Provide dummy noncoherent DMA API
2007-02-12 19:26:05 +00:00
dma.h
Don't include linux/config.h from anywhere else in include/
2006-04-26 12:56:16 +01:00
domain.h
[ARM] nommu: adjust headers for !MMU ARM systems
2006-06-28 17:59:45 +01:00
dyntick.h
[ARM] 3692/1: ARM: coswitch irq handling to the generic implementation
2006-07-01 22:30:09 +01:00
ecard.h
elf.h
[ARM] 4054/1: ep93xx: add HWCAP_CRUNCH
2006-12-18 00:14:54 +00:00
emergency-restart.h
errno.h
fcntl.h
[PATCH] Clean up struct flock64 definitions
2005-09-07 16:57:38 -07:00
fiq.h
flat.h
[ARM] 4074/1: Flat loader stack alignment
2006-12-30 17:05:08 +00:00
floppy.h
[PATCH] ARM: fixup irqflags breakage after ARM genirq merge
2006-07-02 17:29:22 -07:00
fpstate.h
[ARM] 4111/1: Allow VFP to work with thread migration on SMP
2007-01-25 16:35:29 +00:00
futex.h
[PATCH] consolidate asm/futex.h
2006-01-08 20:13:39 -08:00
glue.h
Don't include linux/config.h from anywhere else in include/
2006-04-26 12:56:16 +01:00
hardirq.h
Don't include linux/config.h from anywhere else in include/
2006-04-26 12:56:16 +01:00
hardware.h
hw_irq.h
[PATCH] misc arm pt_regs fixes
2006-10-08 12:32:36 -07:00
ide.h
io.h
[ARM] Remove warnings for __io_pci and __arch_(get|put)*
2006-11-30 14:36:29 +00:00
ioctl.h
[PATCH] Generic ioctl.h
2006-01-10 08:01:34 -08:00
ioctls.h
ipc.h
ipcbuf.h
irq.h
[ARM] 4073/1: Prevent s3c24xx drivers from including asm/arch/hardware.h and asm/arch/irqs.h
2006-12-30 17:05:07 +00:00
irq_regs.h
Initial blind fixup for arm for irq changes
2006-10-06 10:59:54 -07:00
irqflags.h
[ARM] Add ARM irqtrace support
2006-09-20 14:58:35 +01:00
Kbuild
Add empty Kbuild files for 'make headers_install' in remaining arches.
2006-06-18 12:58:53 +01:00
kexec.h
[ARM] 4137/1: Add kexec support
2007-02-16 14:37:06 +00:00
kmap_types.h
leds.h
Don't include linux/config.h from anywhere else in include/
2006-04-26 12:56:16 +01:00
limits.h
linkage.h
local.h
locks.h
[ARM] 3019/1: fix wrong comments
2005-10-18 07:51:34 +01:00
mc146818rtc.h
memory.h
[ARM] Clean up discontigmem support
2006-11-30 22:52:28 +00:00
mman.h
[PATCH] add asm-generic/mman.h
2006-02-15 15:32:22 -08:00
mmu.h
[ARM] Add section support to ioremap
2006-06-29 22:14:30 +01:00
mmu_context.h
[ARM] Add section support to ioremap
2006-06-29 22:14:30 +01:00
mmzone.h
module.h
msgbuf.h
mtd-xip.h
mutex.h
[ARM] 3311/1: clean up include/asm-arm/mutex.h
2006-02-08 21:19:38 +00:00
namei.h
nwflash.h
page-nommu.h
[ARM] nommu: adjust headers for !MMU ARM systems
2006-06-28 17:59:45 +01:00
page.h
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into devel
2006-09-27 19:57:54 +01:00
param.h
[ARM] Move HZ definition into Kconfig
2006-03-21 22:05:45 +00:00
parport.h
pci.h
Don't include linux/config.h from anywhere else in include/
2006-04-26 12:56:16 +01:00
percpu.h
pgalloc.h
[ARM] nommu: adjust headers for !MMU ARM systems
2006-06-28 17:59:45 +01:00
pgtable-hwdef.h
[ARM] Set bit 4 on section mappings correctly depending on CPU
2006-06-29 18:24:21 +01:00
pgtable-nommu.h
[ARM] Fix nommu build
2006-11-30 13:53:54 +00:00
pgtable.h
[ARM] 4158/1: Fix user page protection macros
2007-02-11 17:06:17 +00:00
poll.h
[PATCH] POLLRDHUP/EPOLLRDHUP handling for half-closed devices notifications
2006-03-25 08:22:56 -08:00
posix_types.h
proc-fns.h
[ARM] nommu: add ARM946E-S core support
2006-09-27 17:39:19 +01:00
processor.h
[ARM] 4016/1: prefetch macro is wrong wrt gcc's "delete-null-pointer-checks"
2006-12-13 18:30:20 +00:00
procinfo.h
[ARM] Move HWCAP_* definitions to asm/elf.h
2006-11-30 12:24:46 +00:00
ptrace.h
[ARM] 3665/1: crunch: add ptrace support
2006-06-28 17:55:00 +01:00
resource.h
rtc.h
[PATCH] RTC subsystem: ARM cleanup
2006-03-27 08:44:50 -08:00
scatterlist.h
[ARM] Remove '__address' from scatterlist and convert to DMA API
2006-01-04 15:08:30 +00:00
sections.h
segment.h
semaphore-helper.h
semaphore.h
[ARM] sema_count() removal
2005-12-01 20:58:01 +00:00
sembuf.h
serial.h
setup.h
[PATCH] cleanup asm/setup.h userspace visibility
2006-12-07 08:39:46 -08:00
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
[PATCH] ARM: fixup irqflags breakage after ARM genirq merge
2006-07-02 17:29:22 -07:00
sizes.h
smp.h
Don't include linux/config.h from anywhere else in include/
2006-04-26 12:56:16 +01:00
socket.h
[AF_UNIX]: Datagram getpeersec
2006-06-29 16:58:06 -07:00
sockios.h
spinlock.h
[PATCH] Directed yield: cpu_relax variants for spinlocks and rw-locks
2006-10-01 00:39:21 -07:00
spinlock_types.h
[PATCH] spinlock consolidation
2005-09-10 10:06:21 -07:00
stat.h
[ARM] 3106/2: ARM EABI: some syscall adjustments
2006-01-14 16:32:12 +00:00
statfs.h
[ARM] 3108/2: old ABI compat: statfs64 and fstatfs64
2006-01-14 16:35:03 +00:00
string.h
suspend.h
system.h
[ARM] Fix warnings from asm/system.h
2006-12-18 00:12:47 +00:00
termbits.h
[PATCH] tty: preparatory structures for termios revamp
2006-12-08 08:28:56 -08:00
termios.h
therm.h
thread_info.h
[PATCH] PM: Fix SMP races in the freezer
2006-12-13 09:05:49 -08:00
thread_notify.h
[ARM] Add thread_notify infrastructure
2006-06-22 10:24:18 +01:00
timex.h
tlb.h
[ARM] noMMU: removes TLB codes in nommu mode
2006-03-21 22:03:20 +00:00
tlbflush.h
[ARM] 3759/2: Remove uses of %?
2006-09-20 14:58:35 +01:00
topology.h
traps.h
types.h
uaccess.h
[ARM] Add __must_check to uaccess functions
2006-10-28 10:15:31 +01:00
ucontext.h
[ARM] 3664/1: crunch: add signal frame save/restore
2006-06-28 17:54:59 +01:00
unaligned.h
[ARM] 3849/1: fix get_unaligned() for gcc >= 4.1
2006-09-25 10:34:00 +01:00
unistd.h
[ARM] 4137/1: Add kexec support
2007-02-16 14:37:06 +00:00
user.h
vfp.h
vfpmacros.h
[ARM] 3472/1: Use the D variants of FLDMIA/FSTMIA on ARMv6
2006-04-10 21:32:42 +01:00
vga.h
[PATCH] vgacon: make VGA_MAP_MEM take size, remove extra use
2006-06-22 15:05:58 -07:00
xor.h