diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-14 00:00:04 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-14 00:00:04 +0200 |
| commit | 87abce6e91b668390d07b578100d4053283a67e8 (patch) | |
| tree | 230c7bad063d766fc9cbd34ab89bce338a811739 /include/configs/MPC8536DS.h | |
| parent | c9969947a4687de90e2bb58e76842b491aa0e0b9 (diff) | |
| parent | bb272ec8df6e35b7e19ce1237cae28798167a624 (diff) | |
| download | u-boot-imx-87abce6e91b668390d07b578100d4053283a67e8.zip u-boot-imx-87abce6e91b668390d07b578100d4053283a67e8.tar.gz u-boot-imx-87abce6e91b668390d07b578100d4053283a67e8.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'include/configs/MPC8536DS.h')
| -rw-r--r-- | include/configs/MPC8536DS.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 9e00b89..7085d28 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -427,12 +427,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #undef CONFIG_TULIP #undef CONFIG_RTL8139 -#ifdef CONFIG_RTL8139 -/* This macro is used by RTL8139 but not defined in PPC architecture */ -#define KSEG1ADDR(x) ({u32 _x=le32_to_cpu(*(u32 *)(x)); (&_x);}) -#define _IO_BASE 0x00000000 -#endif - #ifndef CONFIG_PCI_PNP #define PCI_ENET0_IOADDR CONFIG_SYS_PCI1_IO_BUS #define PCI_ENET0_MEMADDR CONFIG_SYS_PCI1_IO_BUS |