diff -urN infiniband/Kconfig infiniband-patch/Kconfig
--- infiniband/Kconfig	2005-10-17 09:28:41.000000000 -0700
+++ infiniband-patch/Kconfig	2005-10-17 09:51:08.000000000 -0700
@@ -30,6 +30,8 @@
 
 source "drivers/infiniband/hw/mthca/Kconfig"
 
+source "drivers/infiniband/hw/ehca/Kconfig"
+
 source "drivers/infiniband/ulp/ipoib/Kconfig"
 
 source "drivers/infiniband/ulp/sdp/Kconfig"
diff -urN infiniband/hw/ehca/Kconfig infiniband-patch/hw/ehca/Kconfig
--- infiniband/hw/ehca/Kconfig	1969-12-31 16:00:00.000000000 -0800
+++ infiniband-patch/hw/ehca/Kconfig	2005-10-17 09:51:55.000000000 -0700
@@ -0,0 +1,6 @@
+config INFINIBAND_EHCA
+        tristate "IBM EHCA support"
+        depends on IBMEBUS && INFINIBAND
+	---help---
+	  This is a low-level driver for IBM eBUS host  
+	  channel adapters (HCAs). 
diff -urN infiniband/hw/ehca/Makefile infiniband-patch/hw/ehca/Makefile
--- infiniband/hw/ehca/Makefile	2005-10-17 09:45:19.000000000 -0700
+++ infiniband-patch/hw/ehca/Makefile	2005-10-17 09:55:33.000000000 -0700
@@ -46,7 +46,7 @@
 endif
 # GEN2_PATH_KERNEL = drivers #for gen2 code in kernel
 
-obj-m += hcad_mod.o 
+obj-$(CONFIG_INFINIBAND_EHCA) += hcad_mod.o 
 
 hcad_mod-objs = ehca_main.o ehca_hca.o ipz_pt_fn.o ehca_classes.o ehca_av.o \
 	ehca_pd.o ehca_mrmw.o ehca_cq.o ehca_sqp.o ehca_qp.o hcp_sense.o \
@@ -59,6 +59,7 @@
 
 
 EXTRA_CFLAGS +=-DP_SERIES -DEHCA_USE_HCALL -DEHCA_USE_HCALL_KERNEL \
+	-Idrivers/infiniband/include \
 	-I$(src)/.  \
 	-I$(GEN2_PATH_KERNEL)/infiniband/include/rdma \
 	-I$(GEN2_PATH_KERNEL)/infiniband/core