linux/arch/m68k/include/asm
Greg Ungerer f2ba710d17 m68knommu: move ColdFire 5249 MBAR2 definition
The MBAR2 register is only used on the ColdFire 5249 part, so move its
definition out of the common coldfire.h and into the 5249 support header.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
2011-03-15 21:01:53 +10:00
..
Kbuild Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 2009-01-26 10:33:01 -08:00
MC68EZ328.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
MC68VZ328.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
MC68328.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
MC68332.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
a.out-core.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
a.out.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
adb_iop.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
amigahw.h m68k: Remove dead GG2 config option 2010-10-22 09:43:22 +02:00
amigaints.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
amigayle.h m68k: amiga - Amiga Gayle IDE platform device conversion 2010-05-26 19:51:09 +02:00
amipcmcia.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
anchor.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
apollodma.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
apollohw.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
asm-offsets.h kbuild: move asm-offsets.h to include/generated 2009-12-12 13:08:14 +01:00
atafd.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
atafdreg.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
atari_joystick.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
atari_stdma.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
atari_stram.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
atarihw.h m68k/atari: Rename "scc" to "atari_scc" 2011-01-23 11:24:35 +01:00
atariints.h m68k: atari - Rename "mfp" to "st_mfp" 2009-02-22 09:23:02 -08:00
atarikb.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
atomic.h m68k/m68knommu: merge MMU and non-MMU atomic.h 2010-10-22 09:43:24 +02:00
auxvec.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
bitops.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
bitops_mm.h m68k: Implement generic_find_next_{zero_,}le_bit() 2010-05-17 21:15:40 +02:00
bitops_no.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
bitsperlong.h asm-generic: introduce asm/bitsperlong.h 2009-06-11 21:02:14 +02:00
blinken.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
bootinfo.h tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
bootstd.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
bug.h m68k: merge the mmu and non-mmu versions of bug.h 2009-03-24 15:17:44 +10:00
bugs.h m68k: merge the mmu and non-mmu versions of bugs.h 2009-03-24 15:17:45 +10:00
bvme6000hw.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
byteorder.h m68k{nommu}: fixups after the header move 2009-01-26 10:38:43 -08:00
cache.h dma-mapping: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN 2010-08-11 08:59:21 -07:00
cachectl.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
cacheflush.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
cacheflush_mm.h block: add helpers to run flush_dcache_page() against a bio and a request's pages 2009-11-26 09:16:19 +01:00
cacheflush_no.h m68knommu: create optimal separate instruction and data cache for ColdFire 2011-01-05 15:19:20 +10:00
checksum.h m68k: merge the mmu and non-mmu versions of checksum.h 2009-09-16 09:43:37 +10:00
coldfire.h m68knommu: move ColdFire 5249 MBAR2 definition 2011-03-15 21:01:53 +10:00
commproc.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
contregs.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
cputime.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
current.h m68k: merge the mmu and non-mmu versions of current.h 2009-03-24 15:17:45 +10:00
dbg.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
delay.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
delay_mm.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
delay_no.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
device.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
div64.h m68k: merge the mmu and non-mmu versions of div64.h 2009-03-24 15:17:45 +10:00
dma-mapping.h dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
dma.h m68k: clean up comment delimiters in dma.h 2009-09-16 09:43:38 +10:00
dsp56k.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
dvma.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
elf.h elf: kill USE_ELF_CORE_DUMP 2009-12-16 07:20:12 -08:00
emergency-restart.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
entry.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
entry_mm.h m68k{nommu}/blackfin : remove old assembler-only flags bit definitions 2010-10-26 16:52:12 -07:00
entry_no.h m68knommu: use user stack pointer hardware on some ColdFire cores 2011-01-05 15:19:18 +10:00
errno.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
fb.h m68k: merge the mmu and non-mmu versions of fb.h 2009-03-24 15:17:44 +10:00
fbio.h tree-wide: s/widht/width/g typo in comments 2010-02-05 12:22:42 +01:00
fcntl.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
flat.h flat: fix data sections alignment 2009-05-29 08:40:02 -07:00
floppy.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
fpu.h m68k: use mmu fpu.h for non-mmu builds as well 2009-03-24 15:17:42 +10:00
ftrace.h tracing: make CALLER_ADDRx overwriteable 2009-03-02 16:49:37 -05:00
futex.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
gpio.h m68knommu: make Coldfire 548x support more generic 2011-01-05 15:19:17 +10:00
hardirq.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
hardirq_mm.h revert "m68k: convert to asm-generic/hardirq.h" 2009-10-01 16:11:11 -07:00
hardirq_no.h m68knommu: convert to asm-generic/hardirq.h 2009-09-16 09:43:36 +10:00
hp300hw.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
hw_irq.h m68k: the one hw_irq.h can be used buy all m68k 2009-03-24 15:17:42 +10:00
hwtest.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
ide.h m68knommu: arch/m68k/include/asm/ide.h fix for nommu 2010-08-18 12:44:31 +10:00
idprom.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
intersil.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
io.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
io_mm.h m68k: Add missing I/O macros {in,out}{w,l}_p() for !CONFIG_ISA 2010-10-22 09:43:25 +02:00
io_no.h m68knommu: remove empty __iounmap() it is no used 2011-01-05 15:19:18 +10:00
ioctl.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
ioctls.h m68k: Use asm-generic/ioctls.h (enables termiox) 2010-10-22 09:43:23 +02:00
ipcbuf.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
irq.h m68k: merge mmu and non-mmu versions of irq.h 2009-09-16 09:43:37 +10:00
irq_regs.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
irqflags.h m68k, m68knommu: Do not include linux/hardirq.h in asm/irqflags.h 2010-11-03 11:30:07 +10:00
kdebug.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
kmap_types.h kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
linkage.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
local.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
local64.h arch: Implement local64_t 2010-06-09 11:12:36 +02:00
m52xxacr.h m68knommu: create optimal separate instruction and data cache for ColdFire 2011-01-05 15:19:20 +10:00
m53xxacr.h m68knommu: create optimal separate instruction and data cache for ColdFire 2011-01-05 15:19:20 +10:00
m54xxacr.h m68knommu: create optimal separate instruction and data cache for ColdFire 2011-01-05 15:19:20 +10:00
m54xxgpt.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 2011-01-18 08:05:20 -08:00
m54xxsim.h m68knommu: move inclusion of ColdFire v4 cache registers 2011-01-05 15:19:18 +10:00
m520xsim.h m68knommu: create bit definitions for the version 2 ColdFire cache controller 2011-01-05 15:19:18 +10:00
m523xsim.h m68knommu: create bit definitions for the version 2 ColdFire cache controller 2011-01-05 15:19:18 +10:00
m527xsim.h m68knommu: create bit definitions for the version 2 ColdFire cache controller 2011-01-05 15:19:18 +10:00
m528xsim.h m68knommu: create bit definitions for the version 2 ColdFire cache controller 2011-01-05 15:19:18 +10:00
m532xsim.h m68knommu: merge bit definitions for version 3 ColdFire cache controller 2011-01-05 15:19:18 +10:00
m5206sim.h m68knommu: create bit definitions for the version 2 ColdFire cache controller 2011-01-05 15:19:18 +10:00
m5249sim.h m68knommu: move ColdFire 5249 MBAR2 definition 2011-03-15 21:01:53 +10:00
m5272sim.h m68knommu: create bit definitions for the version 2 ColdFire cache controller 2011-01-05 15:19:18 +10:00
m5307sim.h m68knommu: merge bit definitions for version 3 ColdFire cache controller 2011-01-05 15:19:18 +10:00
m5407sim.h m68knommu: move inclusion of ColdFire v4 cache registers 2011-01-05 15:19:18 +10:00
m68360.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
m68360_enet.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
m68360_pram.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
m68360_quicc.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
m68360_regs.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
mac_asc.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
mac_baboon.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
mac_iop.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
mac_mouse.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
mac_oss.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
mac_psc.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
mac_via.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
machdep.h m68knommu: add back in declaration of do_IRQ 2010-11-03 11:29:58 +10:00
machines.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
machw.h mac68k: replace mac68k SCC code with platform device 2010-02-27 18:31:09 +01:00
macintosh.h m68k: mac - Add a new entry in mac_model to identify the floppy controller type. 2009-03-26 21:15:27 +01:00
macints.h mac68k: replace mac68k SCC code with platform device 2010-02-27 18:31:09 +01:00
math-emu.h locking, m68k/asm-offsets: Rename pt_regs offset defines 2009-08-31 18:08:49 +02:00
mc146818rtc.h m68k: use the mc146818rtc.h for non-mmu setups as well. 2009-03-24 15:17:41 +10:00
mcfdma.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
mcfgpio.h core generic GPIO support for Freescale Coldfire processors. 2009-09-10 12:01:22 +10:00
mcfintc.h m68knommu: map ColdFire interrupts to correct masking bits 2009-09-16 09:43:52 +10:00
mcfmbus.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
mcfne.h m68knommu: remove special interrupt handling code for ne2k support 2009-09-16 09:43:55 +10:00
mcfpit.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
mcfqspi.h m68knommu: Coldfire QSPI platform support 2010-05-17 11:04:19 +10:00
mcfsim.h m68knommu: make Coldfire 548x support more generic 2011-01-05 15:19:17 +10:00
mcfslt.h m68knommu: add basic mmu-less m548x support 2010-10-21 10:17:30 +10:00
mcftimer.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
mcfuart.h m68knommu: move UART addressing to part specific includes 2011-01-05 15:19:17 +10:00
mcfwdebug.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
mman.h mm: remove duplicate asm/mman.h files 2009-09-22 07:17:42 -07:00
mmu.h m68k: merge the mmu and non-mmu versions of mmu.h 2009-03-24 15:17:42 +10:00
mmu_context.h m68k: merge the mmu and non-mmu versions of mmu_context.h 2009-03-24 15:17:45 +10:00
mmzone.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
module.h m68k: merge the mmu and non-mmu versions of module.h 2009-03-24 15:17:45 +10:00
motorola_pgalloc.h arch/m68k/include/asm/motorola_pgalloc.h: fix kunmap arg 2009-08-26 23:14:49 +02:00
motorola_pgtable.h mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
movs.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
msgbuf.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
mutex.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
mvme16xhw.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
mvme147hw.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
nettel.h generic GPIO support misc files. 2009-09-10 12:01:24 +10:00
nubus.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
openprom.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
oplib.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
page.h m68k/m68knommu: clean up page.h 2010-10-22 09:43:24 +02:00
page_mm.h m68k: __pa(): cast arg to long 2010-10-22 09:43:25 +02:00
page_no.h m68k/m68knommu: clean up page.h 2010-10-22 09:43:24 +02:00
page_offset.h m68k: merge the mmu and non-mmu versions of page_offset.h 2009-03-24 15:17:43 +10:00
param.h m68k: Simplify param.h by using <asm-generic/param.h> 2010-05-17 21:15:39 +02:00
parport.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
pci.h m68k: use the mmu pci.h for m68knommu as well 2009-03-24 15:17:41 +10:00
percpu.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
pgalloc.h m68k: merge the mmu and non-mmu versions of pgalloc.h 2009-03-24 15:17:43 +10:00
pgtable.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
pgtable_mm.h MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself 2010-02-20 16:41:46 +00:00
pgtable_no.h m68knommu: mv definition of check_pgt_cache() 2009-03-24 15:17:43 +10:00
pinmux.h core generic GPIO support for Freescale Coldfire processors. 2009-09-10 12:01:22 +10:00
poll.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
posix_types.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
processor.h m68knommu: use user stack pointer hardware on some ColdFire cores 2011-01-05 15:19:18 +10:00
ptrace.h ptrace: move user_enable_single_step & co prototypes to linux/ptrace.h 2010-03-12 15:52:38 -08:00
q40_master.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
q40ints.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
quicc_simple.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
raw_io.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
resource.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
rtc.h m68k: Hook up rtc-generic 2009-04-02 01:05:31 +00:00
sbus.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
scatterlist.h remove needless ISA_DMA_THRESHOLD 2010-08-07 18:15:50 +02:00
sections.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
segment.h m68k: merge the mmu and non-mmu versions of segment.h 2009-03-24 15:17:44 +10:00
sembuf.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
serial.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
setup.h m68k: use MMU version of setup.h for both MMU and non-MMU 2009-03-17 08:44:41 +10:00
shm.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
shmbuf.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
shmparam.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
sigcontext.h m68k: Fix `struct sigcontext' for ColdFire 2010-04-14 19:45:37 +02:00
siginfo.h m68k: Switch to generic siginfo layout 2010-02-27 18:31:17 +01:00
signal.h asm-generic: rename termios.h, signal.h and mman.h 2009-06-11 21:01:52 +02:00
smp.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
socket.h net: Generalize socket rx gap / receive queue overflow cmsg 2009-10-12 13:26:31 -07:00
sockios.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
spinlock.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
stat.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
statfs.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
string.h m68knommu: add optimize memmove() function 2011-02-16 09:43:16 +10:00
sun3-head.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
sun3_pgalloc.h mm: Pass virtual address to [__]p{te,ud,md}_free_tlb() 2009-07-27 12:10:38 -07:00
sun3_pgtable.h m68k/sun3: Kill pte_unmap() warnings 2011-01-05 21:17:19 +01:00
sun3ints.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
sun3mmu.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
sun3x.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
sun3xflop.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
sun3xprom.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
swab.h m68k: Fix asm/swab.h for ColdFire 2010-02-27 18:27:13 +01:00
system.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
system_mm.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 2010-10-22 17:33:35 -07:00
system_no.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 2010-10-22 17:33:35 -07:00
termbits.h tty: Add EXTPROC support for LINEMODE 2010-08-10 13:47:39 -07:00
termios.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
thread_info.h m68k: Switch to saner sigsuspend() 2011-01-07 14:01:33 +01:00
timex.h m68knommu: fix ColdFire definition of CLOCK_TICK_RATE 2009-09-16 09:43:56 +10:00
tlb.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
tlbflush.h m68k: merge the mmu and non-mmu versions of tlbflush.h 2009-03-24 15:17:45 +10:00
topology.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
traps.h m68k/m68knommu: merge the MMU and non-MMU traps.h 2010-10-22 09:43:24 +02:00
types.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
uaccess.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
uaccess_mm.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
uaccess_no.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
ucontext.h m68k: Define sigcontext ABI of ColdFire 2010-02-27 18:44:10 +01:00
unaligned.h m68k: Restore correct include guards for <asm/unaligned.h> 2009-03-24 15:17:43 +10:00
unistd.h m68knommu: Switch to saner sigsuspend 2011-01-07 14:06:59 +01:00
user.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
virtconvert.h m68k: Eliminate unused variable in page_to_phys() 2010-02-27 18:31:18 +01:00
xor.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00
zorro.h m68k,m68knommu: merge header files 2009-01-16 21:58:10 +10:00