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/mpc52xx.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/mpc52xx.h')
| -rw-r--r-- | include/asm-ppc/mpc52xx.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/asm-ppc/mpc52xx.h b/include/asm-ppc/mpc52xx.h index 64c8874618dc..d9d21aa68ba3 100644 --- a/include/asm-ppc/mpc52xx.h +++ b/include/asm-ppc/mpc52xx.h | |||
| @@ -29,17 +29,6 @@ struct pt_regs; | |||
| 29 | #endif /* __ASSEMBLY__ */ | 29 | #endif /* __ASSEMBLY__ */ |
| 30 | 30 | ||
| 31 | 31 | ||
| 32 | #ifdef CONFIG_PCI | ||
| 33 | #define _IO_BASE isa_io_base | ||
| 34 | #define _ISA_MEM_BASE isa_mem_base | ||
| 35 | #define PCI_DRAM_OFFSET pci_dram_offset | ||
| 36 | #else | ||
| 37 | #define _IO_BASE 0 | ||
| 38 | #define _ISA_MEM_BASE 0 | ||
| 39 | #define PCI_DRAM_OFFSET 0 | ||
| 40 | #endif | ||
| 41 | |||
| 42 | |||
| 43 | /* ======================================================================== */ | 32 | /* ======================================================================== */ |
| 44 | /* PPC Sys devices definition */ | 33 | /* PPC Sys devices definition */ |
| 45 | /* ======================================================================== */ | 34 | /* ======================================================================== */ |