diff options
author | Dmitry Torokhov | 2005-12-21 05:03:50 +0100 |
---|---|---|
committer | Dmitry Torokhov | 2005-12-21 05:03:50 +0100 |
commit | 041387d98460b3947587929ef3a4773b8c48538f (patch) | |
tree | 3330eebba3fa1aa7c13479e527f07b03d7fb53ed /drivers/media/dvb/frontends/cx22702.h | |
parent | Input: add the fn key to hid-debug.h (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
download | kernel-qcow2-linux-041387d98460b3947587929ef3a4773b8c48538f.tar.gz kernel-qcow2-linux-041387d98460b3947587929ef3a4773b8c48538f.tar.xz kernel-qcow2-linux-041387d98460b3947587929ef3a4773b8c48538f.zip |
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
Diffstat (limited to 'drivers/media/dvb/frontends/cx22702.h')
-rw-r--r-- | drivers/media/dvb/frontends/cx22702.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/cx22702.h b/drivers/media/dvb/frontends/cx22702.h index 1f250885d2ce..5633976a58f1 100644 --- a/drivers/media/dvb/frontends/cx22702.h +++ b/drivers/media/dvb/frontends/cx22702.h @@ -2,7 +2,7 @@ Conexant 22702 DVB OFDM demodulator driver based on: - Alps TDMB7 DVB OFDM demodulator driver + Alps TDMB7 DVB OFDM demodulator driver Copyright (C) 2001-2002 Convergence Integrated Media GmbH Holger Waechtler <holger@convergence.de> |