From 1e4b90e45be210fa5d8be622f6dab2b7a6838ab8 Mon Sep 17 00:00:00 2001
From: Oleksij Rempel <bug-track@fisher-privat.net>
Date: Fri, 4 May 2012 17:14:28 +0200
Subject: [PATCH] --- yaml --- r: 304566 b: refs/heads/master c:
 d66af05301c7859b676d95db915ebee4c8c01092 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/staging/rts5139/rts51x_fop.c  | 5 -----
 trunk/drivers/staging/rts5139/rts51x_fop.h  | 5 -----
 trunk/drivers/staging/rts5139/rts51x_scsi.h | 4 ----
 4 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 7db3057928e7..948399c9ef87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d705b84c6e44d8d1fe0dafe34a20a12846ab07ed
+refs/heads/master: d66af05301c7859b676d95db915ebee4c8c01092
diff --git a/trunk/drivers/staging/rts5139/rts51x_fop.c b/trunk/drivers/staging/rts5139/rts51x_fop.c
index 6eaebb6223c9..ef893c8cdec6 100644
--- a/trunk/drivers/staging/rts5139/rts51x_fop.c
+++ b/trunk/drivers/staging/rts5139/rts51x_fop.c
@@ -234,12 +234,7 @@ ssize_t rts51x_write(struct file *filp, const char __user *buf, size_t count,
 	return 0;
 }
 
-#if 0 /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) */
-int rts51x_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
-		 unsigned long arg)
-#else
 long rts51x_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
-#endif
 {
 	struct rts51x_chip *chip;
 	struct sd_direct_cmnd cmnd;
diff --git a/trunk/drivers/staging/rts5139/rts51x_fop.h b/trunk/drivers/staging/rts5139/rts51x_fop.h
index 94d75f08d255..eb45acf50d1a 100644
--- a/trunk/drivers/staging/rts5139/rts51x_fop.h
+++ b/trunk/drivers/staging/rts5139/rts51x_fop.h
@@ -50,12 +50,7 @@ ssize_t rts51x_read(struct file *filp, char __user *buf, size_t count,
 		    loff_t *f_pos);
 ssize_t rts51x_write(struct file *filp, const char __user *buf, size_t count,
 		     loff_t *f_pos);
-#if 0 /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) */
-int rts51x_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
-		 unsigned long arg);
-#else
 long rts51x_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
-#endif
 
 #endif
 
diff --git a/trunk/drivers/staging/rts5139/rts51x_scsi.h b/trunk/drivers/staging/rts5139/rts51x_scsi.h
index 3a8ca069b278..6ba727394fb9 100644
--- a/trunk/drivers/staging/rts5139/rts51x_scsi.h
+++ b/trunk/drivers/staging/rts5139/rts51x_scsi.h
@@ -150,11 +150,7 @@ int slave_alloc(struct scsi_device *sdev);
 int slave_configure(struct scsi_device *sdev);
 int proc_info(struct Scsi_Host *host, char *buffer,
 	      char **start, off_t offset, int length, int inout);
-#if 0 /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37) */
-int queuecommand(struct scsi_cmnd *srb, void (*done) (struct scsi_cmnd *));
-#else
 int queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
-#endif
 int command_abort(struct scsi_cmnd *srb);
 int device_reset(struct scsi_cmnd *srb);
 int bus_reset(struct scsi_cmnd *srb);