Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial branch from Jiri Kosina: "Usual stuff -- comment/printk typo fixes, documentation updates, dead code elimination." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits) HOWTO: fix double words typo x86 mtrr: fix comment typo in mtrr_bp_init propagate name change to comments in kernel source doc: Update the name of profiling based on sysfs treewide: Fix typos in various drivers treewide: Fix typos in various Kconfig wireless: mwifiex: Fix typo in wireless/mwifiex driver messages: i2o: Fix typo in messages/i2o scripts/kernel-doc: check that non-void fcts describe their return value Kernel-doc: Convention: Use a "Return" section to describe return values radeon: Fix typo and copy/paste error in comments doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c various: Fix spelling of "asynchronous" in comments. Fix misspellings of "whether" in comments. eisa: Fix spelling of "asynchronous". various: Fix spelling of "registered" in comments. doc: fix quite a few typos within Documentation target: iscsi: fix comment typos in target/iscsi drivers treewide: fix typo of "suport" in various comments and Kconfig treewide: fix typo of "suppport" in various comments ...
This commit is contained in:
@@ -628,7 +628,7 @@ Amd7930_l1hw(struct PStack *st, int pr, void *arg)
|
||||
if ((cs->dc.amd7930.ph_state == 8)) {
|
||||
/* b-channels off, PH-AR cleared
|
||||
* change to F3 */
|
||||
Amd7930_ph_command(cs, 0x20, "HW_RESET REQEST"); //LMR1 bit 5
|
||||
Amd7930_ph_command(cs, 0x20, "HW_RESET REQUEST"); //LMR1 bit 5
|
||||
spin_unlock_irqrestore(&cs->lock, flags);
|
||||
} else {
|
||||
Amd7930_ph_command(cs, 0x40, "HW_RESET REQUEST");
|
||||
|
@@ -1417,7 +1417,7 @@ modeisar(struct BCState *bcs, int mode, int bc)
|
||||
&bcs->hw.isar.reg->Flags))
|
||||
bcs->hw.isar.dpath = 1;
|
||||
else {
|
||||
printk(KERN_WARNING"isar modeisar both pathes in use\n");
|
||||
printk(KERN_WARNING"isar modeisar both paths in use\n");
|
||||
return (1);
|
||||
}
|
||||
break;
|
||||
|
Reference in New Issue
Block a user