u-boot/include/asm-ppc
roy zang e0b369e4f7 Fix the confilcts when merging 'master' into hpc2.
The conflicts due to a new mpc7448 p3m7448 board is in the main tree.

Merge branch 'master' into hpc2

Conflicts:

	MAKEALL
	cpu/74xx_7xx/cpu.c
	cpu/74xx_7xx/cpu_init.c
	cpu/74xx_7xx/speed.c
2006-12-01 12:09:33 +08:00
..
5xx_immap.h * Code cleanup: 2003-06-27 21:31:46 +00:00
8xx_immap.h Patch by Yuli Barcohen, 19 Apr 2004: 2004-06-06 21:35:06 +00:00
atomic.h Initial revision 2001-04-28 17:59:11 +00:00
bitops.h * Code cleanup: 2003-06-27 21:31:46 +00:00
byteorder.h Cleanup for GCC-4.x 2005-10-13 16:45:02 +02:00
cache.h Initial revision 2002-05-15 20:05:05 +00:00
cpm_85xx.h Fix DPRAM offset/size for MPC8541/8555. 2005-12-06 15:02:31 +01:00
cpm_8260.h * Patches by Pantelis Antoniou, 30 Mar 2004: 2004-04-15 18:22:41 +00:00
e300.h mpc83xx: Add MPC8360EMDS basic board support 2006-11-03 19:42:21 -06:00
errno.h Initial revision 2000-08-21 15:05:47 +00:00
fsl_i2c.h Make fsl-i2c not conflict with SOFT I2C 2006-11-29 00:25:26 -06:00
global_data.h Fix the confilcts when merging 'master' into hpc2. 2006-12-01 12:09:33 +08:00
immap_83xx.h Code cleanup. 2006-11-30 18:02:20 +01:00
immap_85xx.h Use generic I2C register block on 85xx and 86xx. 2006-10-20 17:16:35 -05:00
immap_86xx.h Use generic I2C register block on 85xx and 86xx. 2006-10-20 17:16:35 -05:00
immap_8220.h Patch by TsiChung Liew, 23 Sep 2004: 2004-10-28 00:09:35 +00:00
immap_8260.h Patch by Thomas Viehweger, 14 May 2004: 2004-06-09 12:42:26 +00:00
immap_qe.h mpc83xx: add the QUICC Engine (QE) immap file 2006-11-03 19:42:20 -06:00
io.h * Code cleanup: 2003-06-27 21:31:46 +00:00
iopin_8xx.h Add iopset command on mpc8xx 2005-09-26 00:44:15 +02:00
iopin_85xx.h Add CPM2 I/O pin functions for MPC85xx processors 2006-03-12 22:41:33 +01:00
iopin_8260.h Initial revision 2001-08-05 15:35:05 +00:00
m8260_pci.h * Code cleanup: 2003-06-27 21:31:46 +00:00
mc146818rtc.h Initial revision 2000-11-20 17:21:10 +00:00
mmu.h Fixed leading whitespace issues. 2006-10-13 16:47:53 -05:00
mpc8349_pci.h Added PCI support for MPC8349ADS board 2006-01-12 19:51:38 -06:00
pci_io.h * Code cleanup: 2003-06-27 21:31:46 +00:00
pnp.h * Code cleanup: 2003-06-27 21:31:46 +00:00
posix_types.h Initial revision 2001-04-28 17:59:11 +00:00
processor.h [PATCH] PPC4xx: 440SP Rev. C detection added 2006-11-28 16:09:24 +01:00
ptrace.h * Code cleanup: 2003-06-27 21:31:46 +00:00
residual.h * Code cleanup: 2003-06-27 21:31:46 +00:00
sigcontext.h Initial revision 2000-10-11 22:04:29 +00:00
signal.h Initial revision 2001-04-28 17:59:11 +00:00
status_led.h * Patches by David Müller, 12 Jun 2003: 2003-06-19 23:01:32 +00:00
string.h Initial revision 2000-08-21 15:05:47 +00:00
types.h Initial revision 2000-08-21 15:05:47 +00:00
u-boot.h Merge branch 'master' of http://www.denx.de/git/u-boot 2006-09-19 08:51:24 -05:00