From 4274890e64c6f8e852aeee43922189ac5d6bbd0e Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 16 May 2008 21:15:29 +0100
Subject: [PATCH] --- yaml --- r: 97327 b: refs/heads/master c:
 2c118e0f6b7f3b8021df3c80c80c0545402f38b4 h: refs/heads/master i:   97325:
 c6109d3b988293913881618d9feb068f3f838862   97323:
 1e4eb36d365add57d14c94f2f91e17e2729de2da   97319:
 0031b4a9aaa6432ecf35ad7acf25273f9da2bca6   97311:
 748830a473744099ff16a2d2d97cb270b2e626c6 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/sfc/efx.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ea029659a26c..2742b415c7cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7f13b0b9253e21557ad090144a44f20860332f1
+refs/heads/master: 2c118e0f6b7f3b8021df3c80c80c0545402f38b4
diff --git a/trunk/drivers/net/sfc/efx.c b/trunk/drivers/net/sfc/efx.c
index 1a065fcadc50..3494f4cd314e 100644
--- a/trunk/drivers/net/sfc/efx.c
+++ b/trunk/drivers/net/sfc/efx.c
@@ -793,7 +793,7 @@ static int efx_init_io(struct efx_nic *efx)
  fail4:
 	release_mem_region(efx->membase_phys, efx->type->mem_map_size);
  fail3:
-	efx->membase_phys = 0UL;
+	efx->membase_phys = 0;
  fail2:
 	pci_disable_device(efx->pci_dev);
  fail1:
@@ -811,7 +811,7 @@ static void efx_fini_io(struct efx_nic *efx)
 
 	if (efx->membase_phys) {
 		pci_release_region(efx->pci_dev, efx->type->mem_bar);
-		efx->membase_phys = 0UL;
+		efx->membase_phys = 0;
 	}
 
 	pci_disable_device(efx->pci_dev);