diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-08 14:59:13 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-08 14:59:13 -0700 |
commit | 8aa19ad84c38cd50bfc0560646efe1c9ca83d925 (patch) | |
tree | 46eb8d8ea64620d989cabfe89c4f1d2dbba45b63 /sound/pci/korg1212 | |
parent | 58a2c3221e3c78ea6c71148eb84d4170358981fb (diff) | |
parent | a25f175c2f6962c38cdbacfc4b66b297f4fb54b2 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/pci/korg1212')
-rw-r--r-- | sound/pci/korg1212/korg1212.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c index 09f9cbe116a..5561fd4091e 100644 --- a/sound/pci/korg1212/korg1212.c +++ b/sound/pci/korg1212/korg1212.c @@ -442,7 +442,7 @@ static char* stateName[] = { "Setup for play", "Playing", "Monitor mode on", - "Calibrating" + "Calibrating", "Invalid" }; |