Skip to contentSkip to conversation

s390: #ifdefs in compat_ioctls.

PATCH In review Martin Schwidefsky 1 participant 1 message Jun 21, 2005 s390

lore
Share & tools
lore

Martin Schwidefsky

author
#0 lore raw

PATCH 9/16 s390: #ifdefs in compat_ioctls.

[patch 9/16] s390: #ifdefs in compat_ioctls.

From: Martin Schwidefsky <[email protected]>

Remove superflous #if .. #endif pairs from compat_ioctl.c.

Signed-off-by Martin Schwidefsky <[email protected]>

diffstat:

 arch/s390/kernel/compat_ioctl.c |    6 ------
 1 files changed, 6 deletions(-)
arch/s390/kernel/compat_ioctl.c +0 -6
diff -urpN linux-2.6/arch/s390/kernel/compat_ioctl.c linux-2.6-patched/arch/s390/kernel/compat_ioctl.c
@@ -42,7 +42,6 @@ struct ioctl_trans ioctl_start[] = {
 #include "../../../fs/compat_ioctl.c"
 
 /* s390 only ioctls */
-#if defined(CONFIG_DASD) || defined(CONFIG_DASD_MODULE)
 COMPATIBLE_IOCTL(DASDAPIVER)
 COMPATIBLE_IOCTL(BIODASDDISABLE)
 COMPATIBLE_IOCTL(BIODASDENABLE)

@@ -59,16 +58,11 @@ COMPATIBLE_IOCTL(BIODASDPRRD)
 COMPATIBLE_IOCTL(BIODASDPSRD)
 COMPATIBLE_IOCTL(BIODASDGATTR)
 COMPATIBLE_IOCTL(BIODASDSATTR)
-#if defined(CONFIG_DASD_CMB) || defined(CONFIG_DASD_CMB_MODULE)
 COMPATIBLE_IOCTL(BIODASDCMFENABLE)
 COMPATIBLE_IOCTL(BIODASDCMFDISABLE)
 COMPATIBLE_IOCTL(BIODASDREADALLCMB)
-#endif
-#endif
 
-#if defined(CONFIG_S390_TAPE) || defined(CONFIG_S390_TAPE_MODULE)
 COMPATIBLE_IOCTL(TAPE390_DISPLAY)
-#endif
 
 /* s390 doesn't need handlers here */
 COMPATIBLE_IOCTL(TIOCGSERIAL)