[2.6 patch] drivers/char/mwave/tp3780i.c: remove kernel 2.2 #if's

From: Adrian Bunk
Date: Sat Mar 12 2005 - 11:14:15 EST


This patch removes #if's for kernel 2.2 .

Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

---

drivers/char/mwave/tp3780i.c | 8 +-------
1 files changed, 1 insertion(+), 7 deletions(-)

--- linux-2.6.11-mm2-full/drivers/char/mwave/tp3780i.c.old 2005-03-12 12:19:55.000000000 +0100
+++ linux-2.6.11-mm2-full/drivers/char/mwave/tp3780i.c 2005-03-12 12:20:32.000000000 +0100
@@ -242,20 +242,14 @@
{
int retval = 0;
DSP_3780I_CONFIG_SETTINGS *pSettings = &pBDData->rDspSettings;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
struct resource *pres;
-#endif

PRINTK_2(TRACE_TP3780I,
"tp3780i::tp3780I_ClaimResources entry pBDData %p\n", pBDData);

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
pres = request_region(pSettings->usDspBaseIO, 16, "mwave_3780i");
if ( pres == NULL ) retval = -EIO;
-#else
- retval = check_region(pSettings->usDspBaseIO, 16);
- if (!retval) request_region(pSettings->usDspBaseIO, 16, "mwave_3780i");
-#endif
+
if (retval) {
PRINTK_ERROR(KERN_ERR_MWAVE "tp3780i::tp3780I_ClaimResources: Error: Could not claim I/O region starting at %x\n", pSettings->usDspBaseIO);
retval = -EIO;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/