diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 17:21:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 17:21:32 -0700 |
| commit | 789319db76ccb8f61d2f6a91d2f2fcb70edae9c5 (patch) | |
| tree | 9f00eee8fbeec58c0a5ee6c9ebb8906e8a832670 /drivers | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| parent | sparc64: Add global register dumping facility. (diff) | |
| download | linux-dev-789319db76ccb8f61d2f6a91d2f2fcb70edae9c5.tar.xz linux-dev-789319db76ccb8f61d2f6a91d2f2fcb70edae9c5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Add global register dumping facility.
sparc: remove CVS keywords
sparc64: remove CVS keywords
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/sysrq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 9e9bad8bdcf4..dbce1263bdff 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c @@ -402,6 +402,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = { &sysrq_showstate_blocked_op, /* w */ /* x: May be registered on ppc/powerpc for xmon */ NULL, /* x */ + /* y: May be registered on sparc64 for global register dump */ NULL, /* y */ NULL /* z */ }; |