From 6ad234bbf9eee74609fb315f5c2e712ed45aed0c Mon Sep 17 00:00:00 2001
From: t_jeang <devnull@localhost>
Date: Tue, 6 Jan 2009 12:05:59 +0000
Subject: [PATCH] imported patch solarflare-sfc

---
 buildconfigs/conf.linux/solarflare-sfc               | 6 ++++++
 drivers/net/sfc/kernel_compat.h                      | 3 +++
 drivers/net/sfc/sfc_resource/ci/efhw/common_sysdep.h | 2 +-
 drivers/xen/sfc_netback/ci/efhw/common_sysdep.h      | 2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 buildconfigs/conf.linux/solarflare-sfc

diff --git a/buildconfigs/conf.linux/solarflare-sfc b/buildconfigs/conf.linux/solarflare-sfc
new file mode 100644
index 00000000..e916516e
--- /dev/null
+++ b/buildconfigs/conf.linux/solarflare-sfc
@@ -0,0 +1,6 @@
+CONFIG_SFC=m
+CONFIG_SFC_MTD=m
+CONFIG_SFC_RESOURCE=m
+CONFIG_XEN_NETDEV_ACCEL_SFC_UTIL=m
+CONFIG_XEN_NETDEV_ACCEL_SFC_BACKEND=m
+CONFIG_XEN_NETDEV_ACCEL_SFC_FRONTEND=m
diff --git a/drivers/net/sfc/kernel_compat.h b/drivers/net/sfc/kernel_compat.h
index a0ac2035..77da5a87 100644
--- a/drivers/net/sfc/kernel_compat.h
+++ b/drivers/net/sfc/kernel_compat.h
@@ -399,6 +399,9 @@
 		for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)mask)
 #endif
 
+#undef EFX_NEED_IRQ_HANDLER_T
+#undef EFX_NEED_HEX_DUMP
+
 /**************************************************************************/
 
 #ifdef EFX_NEED_IRQ_HANDLER_T
diff --git a/drivers/net/sfc/sfc_resource/ci/efhw/common_sysdep.h b/drivers/net/sfc/sfc_resource/ci/efhw/common_sysdep.h
index 81a065bc..2d5cc8b9 100644
--- a/drivers/net/sfc/sfc_resource/ci/efhw/common_sysdep.h
+++ b/drivers/net/sfc/sfc_resource/ci/efhw/common_sysdep.h
@@ -59,7 +59,7 @@
 # define PRIx64 "llx"
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+#if 0 && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
 enum {
 	false = 0,
 	true = 1
diff --git a/drivers/xen/sfc_netback/ci/efhw/common_sysdep.h b/drivers/xen/sfc_netback/ci/efhw/common_sysdep.h
index aeaccf0f..d8c068fe 100644
--- a/drivers/xen/sfc_netback/ci/efhw/common_sysdep.h
+++ b/drivers/xen/sfc_netback/ci/efhw/common_sysdep.h
@@ -55,7 +55,7 @@
 #define PRIx64 "llx"
 
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+#if 0 && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
 enum {
 	false = 0,
 	true = 1
-- 
2.39.5