diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 12:01:28 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 12:01:28 -0500 |
| commit | 9db73724453a9350e1c22dbe732d427e2939a5c9 (patch) | |
| tree | 15e3ead6413ae97398a54292acc199bee0864d42 /include/asm-ppc/mpc85xx.h | |
| parent | 4c1ac1b49122b805adfa4efc620592f68dccf5db (diff) | |
| parent | e62438630ca37539c8cc1553710bbfaa3cf960a7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/ata/libata-scsi.c
include/linux/libata.h
Futher merge of Linus's head and compilation fixups.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'include/asm-ppc/mpc85xx.h')
| -rw-r--r-- | include/asm-ppc/mpc85xx.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/asm-ppc/mpc85xx.h b/include/asm-ppc/mpc85xx.h index 9b4851199c76..d7e4a79d77fb 100644 --- a/include/asm-ppc/mpc85xx.h +++ b/include/asm-ppc/mpc85xx.h | |||
| @@ -44,14 +44,6 @@ | |||
| 44 | #include <platforms/85xx/tqm85xx.h> | 44 | #include <platforms/85xx/tqm85xx.h> |
| 45 | #endif | 45 | #endif |
| 46 | 46 | ||
| 47 | #define _IO_BASE isa_io_base | ||
| 48 | #define _ISA_MEM_BASE isa_mem_base | ||
| 49 | #ifdef CONFIG_PCI | ||
| 50 | #define PCI_DRAM_OFFSET pci_dram_offset | ||
| 51 | #else | ||
| 52 | #define PCI_DRAM_OFFSET 0 | ||
| 53 | #endif | ||
| 54 | |||
| 55 | /* | 47 | /* |
| 56 | * The "residual" board information structure the boot loader passes | 48 | * The "residual" board information structure the boot loader passes |
| 57 | * into the kernel. | 49 | * into the kernel. |