diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-29 18:31:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-29 18:31:09 -0700 |
| commit | fe45736f4134b9656c656ac5e15b915192f2704a (patch) | |
| tree | 0e3500989e80afa2443f8cfd3d70e8f632d1c472 /include | |
| parent | a991639c26c7231ddb6de7f34899fb70832b7d04 (diff) | |
| parent | 3f8517e7937d04ac7df9082c741fefc9c873065b (diff) | |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"The usual random collection of relatively small ARM fixes"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 8063/1: bL_switcher: fix individual online status reporting of removed CPUs
ARM: 8064/1: fix v7-M signal return
ARM: 8057/1: amba: Add Qualcomm vendor ID.
ARM: 8052/1: unwind: Fix handling of "Pop r4-r[4+nnn],r14" opcode
ARM: 8051/1: put_user: fix possible data corruption in put_user
ARM: 8048/1: fix v7-M setup stack location
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/amba/bus.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h index 63b5eff0a80f..fdd7e1b61f60 100644 --- a/include/linux/amba/bus.h +++ b/include/linux/amba/bus.h @@ -47,6 +47,7 @@ struct amba_driver { enum amba_vendor { AMBA_VENDOR_ARM = 0x41, AMBA_VENDOR_ST = 0x80, + AMBA_VENDOR_QCOM = 0x51, }; extern struct bus_type amba_bustype; |