summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ttpci/budget.h
diff options
context:
space:
mode:
author <jgarzik@pretzel.yyz.us>2005-06-04 06:40:40 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-06-04 06:40:40 +0200
commitae20ea8525a80a863f70d332cf47b71bd9f54c1f (patch)
tree9d3cedeb65db521a8436b545bd91641549a18d24 /drivers/media/dvb/ttpci/budget.h
parent[libata sata_promise] pdc20619 (PATA) support (diff)
parent[PATCH] prom_find_machine_type typo breaks pSeries lpar boot (diff)
downloadlinux-ae20ea8525a80a863f70d332cf47b71bd9f54c1f.tar.xz
linux-ae20ea8525a80a863f70d332cf47b71bd9f54c1f.zip
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
Diffstat (limited to 'drivers/media/dvb/ttpci/budget.h')
-rw-r--r--drivers/media/dvb/ttpci/budget.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/dvb/ttpci/budget.h
index 10bd41f0363b..c6ef496ba70a 100644
--- a/drivers/media/dvb/ttpci/budget.h
+++ b/drivers/media/dvb/ttpci/budget.h
@@ -64,7 +64,7 @@ struct budget {
spinlock_t debilock;
- struct dvb_adapter *dvb_adapter;
+ struct dvb_adapter dvb_adapter;
struct dvb_frontend *dvb_frontend;
void *priv;
};
@@ -92,6 +92,9 @@ static struct saa7146_pci_extension_data x_var = { \
#define BUDGET_KNC1S 8
#define BUDGET_KNC1C 9
#define BUDGET_KNC1T 10
+#define BUDGET_KNC1SP 11
+#define BUDGET_KNC1CP 12
+#define BUDGET_KNC1TP 13
#define BUDGET_VIDEO_PORTA 0
#define BUDGET_VIDEO_PORTB 1