From bb5b6dbed459e900aab55b710aa2cc40ddec3a5c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 26 Feb 2009 14:07:57 -0800 Subject: [PATCH] --- yaml --- r: 141094 b: refs/heads/master c: 04ac01caa68aca58347ff91354fc4851c9d619e9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/slicoss/slicoss.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 730e1ef4801b..a12daf98ce25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0fba1a954db47fa9f62b559537e552c8cc8752ba +refs/heads/master: 04ac01caa68aca58347ff91354fc4851c9d619e9 diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c index 98ec06aa6a9b..53081140d194 100644 --- a/trunk/drivers/staging/slicoss/slicoss.c +++ b/trunk/drivers/staging/slicoss/slicoss.c @@ -61,7 +61,6 @@ #define SLIC_ASSERT_ENABLED 1 #define SLIC_PING_TIMER_ENABLED 1 #define SLIC_INTERRUPT_PROCESS_LIMIT 1 -#define LINUX_FREES_ADAPTER_RESOURCES 1 #define SLIC_OFFLOAD_IP_CHECKSUM 1 #define STATS_TIMER_INTERVAL 2 #define PING_TIMER_INTERVAL 1 @@ -1787,11 +1786,9 @@ static int slic_if_init(struct adapter *adapter) static void slic_unmap_mmio_space(struct adapter *adapter) { -#if LINUX_FREES_ADAPTER_RESOURCES if (adapter->slic_regs) iounmap(adapter->slic_regs); adapter->slic_regs = NULL; -#endif } static int slic_adapter_allocresources(struct adapter *adapter)