diff options
| author | Adrian Bunk <bunk@stusta.de> | 2005-06-25 14:58:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 16:25:01 -0700 |
| commit | c97f97b374fe07bc300dea629cba14612442c26d (patch) | |
| tree | d92065bf4ecaefae6a559da15ff47383758ff685 /drivers/char/mwave | |
| parent | f040ffab7488c02c0806ec8808fa619d463560f9 (diff) | |
| download | op-kernel-dev-c97f97b374fe07bc300dea629cba14612442c26d.zip op-kernel-dev-c97f97b374fe07bc300dea629cba14612442c26d.tar.gz | |
[PATCH] drivers/char/mwave/tp3780i.c: remove kernel 2.2 #if's
This patch removes #if's for kernel 2.2 .
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/mwave')
| -rw-r--r-- | drivers/char/mwave/tp3780i.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/char/mwave/tp3780i.c b/drivers/char/mwave/tp3780i.c index ab650cd..954d06f 100644 --- a/drivers/char/mwave/tp3780i.c +++ b/drivers/char/mwave/tp3780i.c @@ -242,20 +242,14 @@ int tp3780I_ClaimResources(THINKPAD_BD_DATA * pBDData) { 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; |
