Commit c97f97b3 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

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



This patch removes #if's for kernel 2.2 .

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f040ffab

drivers/char/mwave/tp3780i.c

+1 −7
Original line number Diff line number Diff line
@@ -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;