From 34888be5539bffe804c880ec1355ce2206cb3a10 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Tue, 28 Nov 2006 05:09:22 -0300
Subject: [PATCH] --- yaml --- r: 44105 b: refs/heads/master c:
 036171e75ef866b4fd8650c5b890359482ba2a4c h: refs/heads/master i:   44103:
 bd06a7e612c17eededaeb2fdd04f94a3e2398782 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/dvb/ttpci/budget-ci.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 59dc4e6fe2c6..421ea00ca0e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b6389ff16d57d8706bb516bde0211207aae73af
+refs/heads/master: 036171e75ef866b4fd8650c5b890359482ba2a4c
diff --git a/trunk/drivers/media/dvb/ttpci/budget-ci.c b/trunk/drivers/media/dvb/ttpci/budget-ci.c
index 8f71124099b0..f793a2741e2d 100644
--- a/trunk/drivers/media/dvb/ttpci/budget-ci.c
+++ b/trunk/drivers/media/dvb/ttpci/budget-ci.c
@@ -217,11 +217,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
 		input_dev->id.vendor = saa->pci->vendor;
 		input_dev->id.product = saa->pci->device;
 	}
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
 	input_dev->cdev.dev = &saa->pci->dev;
-# else
-	input_dev->dev = &saa->pci->dev;
-# endif
 
 	/* Select keymap and address */
 	switch (budget_ci->budget.dev->pci->subsystem_device) {