diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2007-11-20 08:19:56 -0700 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2007-11-20 08:19:56 -0700 |
commit | f92edbd8a0ef16a2b9127cbb564c09685728e4b0 (patch) | |
tree | ae33aacff092561e2c64eabc11a8adc5e2acea6b /include | |
parent | efe33035acd5f7c13963a4d52e5aac1b68612ae4 (diff) | |
parent | 9a337ddc154a10a26f117fd147b009abcdeba75a (diff) | |
download | bootable_bootloader_goldelico_gta04-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.zip bootable_bootloader_goldelico_gta04-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.tar.gz bootable_bootloader_goldelico_gta04-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.tar.bz2 |
Merge branch 'origin' into kconfig-for-1.3.1
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-arm/arch-at91rm9200/hardware.h | 2 | ||||
-rw-r--r-- | include/configs/MPC8568MDS.h | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/include/asm-arm/arch-at91rm9200/hardware.h b/include/asm-arm/arch-at91rm9200/hardware.h index 8bb0c47..b868e38 100644 --- a/include/asm-arm/arch-at91rm9200/hardware.h +++ b/include/asm-arm/arch-at91rm9200/hardware.h @@ -24,8 +24,6 @@ #ifndef __ASSEMBLY__ #include "AT91RM9200.h" -#else -#include "AT91RM9200_inc.h" #endif /* Virtual and Physical base address for system peripherals */ diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 548e158..b9366cc 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -334,11 +334,6 @@ extern unsigned long get_clock_freq(void); #define CFG_SRIO_MEM_BASE 0xc0000000 -#if defined(CONFIG_PCI) - -#define CONFIG_NET_MULTI -#define CONFIG_PCI_PNP /* do pci plug-and-play */ - #ifdef CONFIG_QE /* * QE UEC ethernet configuration @@ -377,6 +372,11 @@ extern unsigned long get_clock_freq(void); #endif #endif /* CONFIG_QE */ +#if defined(CONFIG_PCI) + +#define CONFIG_NET_MULTI +#define CONFIG_PCI_PNP /* do pci plug-and-play */ + #undef CONFIG_EEPRO100 #undef CONFIG_TULIP |