diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 16:41:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 16:41:39 -0400 |
| commit | 229aebb873e29726b91e076161649cf45154b0bf (patch) | |
| tree | acc02a3702215bce8d914f4c8cc3d7a1382b1c67 /drivers/media/radio | |
| parent | 8de547e1824437f3c6af180d3ed2162fa4b3f389 (diff) | |
| parent | 50a23e6eec6f20d55a3a920e47adb455bff6046e (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
Update broken web addresses in arch directory.
Update broken web addresses in the kernel.
Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
Revert "Fix typo: configuation => configuration" partially
ida: document IDA_BITMAP_LONGS calculation
ext2: fix a typo on comment in ext2/inode.c
drivers/scsi: Remove unnecessary casts of private_data
drivers/s390: Remove unnecessary casts of private_data
net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
drivers/infiniband: Remove unnecessary casts of private_data
drivers/gpu/drm: Remove unnecessary casts of private_data
kernel/pm_qos_params.c: Remove unnecessary casts of private_data
fs/ecryptfs: Remove unnecessary casts of private_data
fs/seq_file.c: Remove unnecessary casts of private_data
arm: uengine.c: remove C99 comments
arm: scoop.c: remove C99 comments
Fix typo configue => configure in comments
Fix typo: configuation => configuration
Fix typo interrest[ing|ed] => interest[ing|ed]
Fix various typos of valid in comments
...
Fix up trivial conflicts in:
drivers/char/ipmi/ipmi_si_intf.c
drivers/usb/gadget/rndis.c
net/irda/irnet/irnet_ppp.c
Diffstat (limited to 'drivers/media/radio')
| -rw-r--r-- | drivers/media/radio/radio-maxiradio.c | 2 | ||||
| -rw-r--r-- | drivers/media/radio/radio-typhoon.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c index 4349213b403b..255d40df4b46 100644 --- a/drivers/media/radio/radio-maxiradio.c +++ b/drivers/media/radio/radio-maxiradio.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | * anybody does please mail me. | 13 | * anybody does please mail me. |
| 14 | * | 14 | * |
| 15 | * For the pdf file see: | 15 | * For the pdf file see: |
| 16 | * http://www.semiconductors.philips.com/pip/TEA5757H/V1 | 16 | * http://www.nxp.com/acrobat_download2/expired_datasheets/TEA5757_5759_3.pdf |
| 17 | * | 17 | * |
| 18 | * | 18 | * |
| 19 | * CHANGES: | 19 | * CHANGES: |
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c index 03439282dfce..b1f630527dc1 100644 --- a/drivers/media/radio/radio-typhoon.c +++ b/drivers/media/radio/radio-typhoon.c | |||
| @@ -1,9 +1,6 @@ | |||
| 1 | /* Typhoon Radio Card driver for radio support | 1 | /* Typhoon Radio Card driver for radio support |
| 2 | * (c) 1999 Dr. Henrik Seidel <Henrik.Seidel@gmx.de> | 2 | * (c) 1999 Dr. Henrik Seidel <Henrik.Seidel@gmx.de> |
| 3 | * | 3 | * |
| 4 | * Card manufacturer: | ||
| 5 | * http://194.18.155.92/idc/prod2.idc?nr=50753&lang=e | ||
| 6 | * | ||
| 7 | * Notes on the hardware | 4 | * Notes on the hardware |
| 8 | * | 5 | * |
| 9 | * This card has two output sockets, one for speakers and one for line. | 6 | * This card has two output sockets, one for speakers and one for line. |