diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-07-22 21:47:29 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-07-22 21:47:29 -0700 |
commit | bd072111e7319d90a7b8127f91c2806b9a6f279e (patch) | |
tree | 1686978814a2387ebfc16f9f5778a7f0caaf319b /include/linux/serial_reg.h | |
parent | Input: sh_keysc - allow modifying keymap from userspace (diff) | |
parent | Linux 2.6.31-rc4 (diff) | |
download | linux-dev-bd072111e7319d90a7b8127f91c2806b9a6f279e.tar.xz linux-dev-bd072111e7319d90a7b8127f91c2806b9a6f279e.zip |
Merge commit 'v2.6.31-rc4' into next
Diffstat (limited to 'include/linux/serial_reg.h')
-rw-r--r-- | include/linux/serial_reg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h index 96c0d93fc2ca..850db2e80510 100644 --- a/include/linux/serial_reg.h +++ b/include/linux/serial_reg.h @@ -323,6 +323,7 @@ #define UART_OMAP_MVER 0x14 /* Module version register */ #define UART_OMAP_SYSC 0x15 /* System configuration register */ #define UART_OMAP_SYSS 0x16 /* System status register */ +#define UART_OMAP_WER 0x17 /* Wake-up enable register */ #endif /* _LINUX_SERIAL_REG_H */ |