ia64/xen-unstable

changeset 5083:2ea8c80c91eb

bitkeeper revision 1.1472.2.4 (4290dcb3h7sEjyPmT7cQXliR-KX-iQ)

Merge linux-t08.sc.intel.com:/disk2/adsharma/xen-ia64/test1.bk
into linux-t08.sc.intel.com:/disk2/adsharma/xen-ia64/xeno-unstable-ia64-staging.bk
author adsharma@linux-t08.sc.intel.com
date Sun May 22 19:25:39 2005 +0000 (2005-05-22)
parents 541012edd6e5 fa6017bfc76d
children e5235ca194ca
files xen/arch/ia64/lib/Makefile xen/include/asm-ia64/config.h
line diff
     1.1 --- a/xen/arch/ia64/lib/Makefile	Fri May 20 17:23:51 2005 +0000
     1.2 +++ b/xen/arch/ia64/lib/Makefile	Sun May 22 19:25:39 2005 +0000
     1.3 @@ -9,7 +9,7 @@ OBJS := __divsi3.o __udivsi3.o __modsi3.
     1.4  	bitop.o checksum.o clear_page.o csum_partial_copy.o copy_page.o	\
     1.5  	clear_user.o strncpy_from_user.o strlen_user.o strnlen_user.o	\
     1.6  	flush.o ip_fast_csum.o do_csum.o copy_user.o			\
     1.7 -	memset.o strlen.o memcpy.o swiotlb.o
     1.8 +	memset.o strlen.o memcpy.o 
     1.9  
    1.10  default: $(OBJS)
    1.11  	$(LD) -r -o ia64lib.o $(OBJS)
     2.1 --- a/xen/include/asm-ia64/config.h	Fri May 20 17:23:51 2005 +0000
     2.2 +++ b/xen/include/asm-ia64/config.h	Sun May 22 19:25:39 2005 +0000
     2.3 @@ -264,10 +264,6 @@ extern int ht_per_core;
     2.4  #define CONFIG_ACPI_BOOT 1
     2.5  //#endif
     2.6  
     2.7 -#define CONFIG_PCI 1
     2.8 -#define CONFIG_PCI_BIOS 1
     2.9 -#define CONFIG_PCI_DIRECT 1
    2.10 -
    2.11  #define CONFIG_XEN_ATTENTION_KEY 1
    2.12  #endif /* __ASSEMBLY__ */
    2.13  #endif /* __XEN_IA64_CONFIG_H__ */