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 /sound/oss | |
| 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 'sound/oss')
| -rw-r--r-- | sound/oss/ac97_codec.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/oss/ac97_codec.c b/sound/oss/ac97_codec.c index 456a1b4d7832..854c303264dc 100644 --- a/sound/oss/ac97_codec.c +++ b/sound/oss/ac97_codec.c | |||
| @@ -21,11 +21,8 @@ | |||
| 21 | * | 21 | * |
| 22 | ************************************************************************** | 22 | ************************************************************************** |
| 23 | * | 23 | * |
| 24 | * The Intel Audio Codec '97 specification is available at the Intel | 24 | * The Intel Audio Codec '97 specification is available at: |
| 25 | * audio homepage: http://developer.intel.com/ial/scalableplatforms/audio/ | 25 | * http://download.intel.com/support/motherboards/desktop/sb/ac97_r23.pdf |
| 26 | * | ||
| 27 | * The specification itself is currently available at: | ||
| 28 | * ftp://download.intel.com/ial/scalableplatforms/ac97r22.pdf | ||
| 29 | * | 26 | * |
| 30 | ************************************************************************** | 27 | ************************************************************************** |
| 31 | * | 28 | * |