diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /include/linux/keyboard.h | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'include/linux/keyboard.h')
| -rw-r--r-- | include/linux/keyboard.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/keyboard.h b/include/linux/keyboard.h index a3c984d780f0..33a63f62d57f 100644 --- a/include/linux/keyboard.h +++ b/include/linux/keyboard.h | |||
| @@ -56,6 +56,7 @@ extern int unregister_keyboard_notifier(struct notifier_block *nb); | |||
| 56 | #define KT_ASCII 9 | 56 | #define KT_ASCII 9 |
| 57 | #define KT_LOCK 10 | 57 | #define KT_LOCK 10 |
| 58 | #define KT_SLOCK 12 | 58 | #define KT_SLOCK 12 |
| 59 | #define KT_DEAD2 13 | ||
| 59 | #define KT_BRL 14 | 60 | #define KT_BRL 14 |
| 60 | 61 | ||
| 61 | #define K(t,v) (((t)<<8)|(v)) | 62 | #define K(t,v) (((t)<<8)|(v)) |