Merge

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/ia64/boot/Makefile
index a724c454ed4becd9eabdb25442f79cc6b353d969,badf4820d08868245c5b843335635c01249cf93d..b18c6323ee9b1901f4aa63404e06fc54b9580812
--- 1/arch/ia64/boot/Makefile
--- 2/arch/ia64/boot/Makefile
+++ b/arch/ia64/boot/Makefile
@@@ -8,9 -8,10 +8,8 @@@
  # Copyright (C) 1998 by David Mosberger-Tang <davidm@hpl.hp.com>
  #
  
 -EXTRA_TARGETS := vmlinux.bin vmlinux.gz
 -
  targets-$(CONFIG_IA64_HP_SIM)  += bootloader
- targets-$(CONFIG_IA64_GENERIC) += bootloader
 -EXTRA_TARGETS += $(sort $(targets-y))
 +targets := vmlinux.bin vmlinux.gz $(targets-y)
  
  quiet_cmd_cptotop = LN      $@
        cmd_cptotop = ln -f $< $@

diff --cc arch/ia64/ia32/sys_ia32.c
Simple merge

diff --cc arch/ia64/kernel/Makefile
index 583fb849c9573762a70de9033614c1001c2796e6,4c5eba406fb07e934025fcfe96756750c49fa7a9..176a9731c33eb052c7c9f56a5e3703520e05b243
--- 1/arch/ia64/kernel/Makefile
--- 2/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@@ -2,18 -2,17 +2,17 @@@
  # Makefile for the linux kernel.
  #
  
 -EXTRA_TARGETS := head.o init_task.o
 +extra-y       := head.o init_task.o
  
- obj-y := acpi.o entry.o gate.o efi.o efi_stub.o ia64_ksyms.o \
-        irq.o irq_ia64.o irq_lsapic.o ivt.o \
-        machvec.o pal.o process.o perfmon.o ptrace.o sal.o \
-        semaphore.o setup.o    \
-        signal.o sys_ia64.o traps.o time.o unaligned.o unwind.o
+ obj-y := acpi.o entry.o efi.o efi_stub.o gate.o ia64_ksyms.o irq.o irq_ia64.o irq_lsapic.o    \
+        ivt.o machvec.o pal.o perfmon.o process.o ptrace.o sal.o semaphore.o setup.o signal.o  \
+        sys_ia64.o time.o traps.o unaligned.o unwind.o
  
- obj-$(CONFIG_FSYS) += fsys.o
- obj-$(CONFIG_IOSAPIC) += iosapic.o
- obj-$(CONFIG_IA64_PALINFO) += palinfo.o
- obj-$(CONFIG_EFI_VARS) += efivars.o
- obj-$(CONFIG_SMP) += smp.o smpboot.o
- obj-$(CONFIG_IA64_MCA) += mca.o mca_asm.o
- obj-$(CONFIG_IA64_BRL_EMU) += brl_emu.o
+ obj-$(CONFIG_EFI_VARS)                += efivars.o
+ obj-$(CONFIG_FSYS)            += fsys.o
+ obj-$(CONFIG_IA64_BRL_EMU)    += brl_emu.o
+ obj-$(CONFIG_IA64_MCA)                += mca.o mca_asm.o
+ obj-$(CONFIG_IA64_PALINFO)    += palinfo.o
+ obj-$(CONFIG_IOSAPIC)         += iosapic.o
+ obj-$(CONFIG_MODULES)         += module.o
+ obj-$(CONFIG_SMP)             += smp.o smpboot.o

diff --cc arch/ia64/kernel/traps.c
Simple merge

diff --cc arch/ia64/pci/pci.c
Simple merge

diff --cc include/asm-ia64/ia32.h
Simple merge

diff --cc include/asm-ia64/pci.h
index 69a58612d87b602790c0e5765fb4b73d9f3732d2,da5043aeafb4269662a9c45655776cc6db845e73..56760f7abe13bf6dd2efd48146f115c95fe5b406
--- 1/include/asm-ia64/pci.h
--- 2/include/asm-ia64/pci.h
+++ b/include/asm-ia64/pci.h
@@@ -97,7 -97,15 +97,18 @@@ extern int pcibios_prep_mwi (struct pci
  extern int pci_mmap_page_range (struct pci_dev *dev, struct vm_area_struct *vma,
                                enum pci_mmap_state mmap_state, int write_combine);
  
+ struct pci_controller {
+       void *acpi_handle;
+       void *iommu;
+       int segment;
+ 
+       u64 mem_offset;
+ };
+ 
+ #define PCI_CONTROLLER(busdev) ((struct pci_controller *) busdev->sysdata)
+ #define PCI_SEGMENT(busdev)    (PCI_CONTROLLER(busdev)->segment)
+ 
 +/* generic pci stuff */
 +#include <asm-generic/pci.h>
 +
  #endif /* _ASM_IA64_PCI_H */

diff --cc include/asm-ia64/processor.h
Simple merge