diff options
| author | Olof Johansson <olof@lixom.net> | 2015-10-26 10:39:22 +0900 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-10-26 10:39:22 +0900 |
| commit | 2bf8bda933a04b5b9cdeb9a6b412fd8bd1ea7500 (patch) | |
| tree | 64b758b1b4f33f4bedaa625c519ced86352ee767 /drivers/firmware/Makefile | |
| parent | d787dcdb9c8f412b1dd0727f90d3f793a61a2551 (diff) | |
| parent | 16134b3bc317c571e953d18196acf0a92afda5ff (diff) | |
Merge tag 'arm/soc/for-4.4/rpi-drivers' of https://github.com/Broadcom/stblinux into next/drivers
This pull request contains the Raspberry Pi firmware driver, for communicating
with the VPU which has exclusive control of some of the peripherals.
Eric adds the actual firmware driver and Alexander fixes the header file which
was missing include guards.
* tag 'arm/soc/for-4.4/rpi-drivers' of https://github.com/Broadcom/stblinux:
ARM: bcm2835: add mutual inclusion protection
ARM: bcm2835: Add the Raspberry Pi firmware driver
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/firmware/Makefile')
| -rw-r--r-- | drivers/firmware/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index b984dd7d9ccb..48dd4175297e 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -13,6 +13,7 @@ obj-$(CONFIG_DMIID) += dmi-id.o obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o +obj-$(CONFIG_RASPBERRYPI_FIRMWARE) += raspberrypi.o obj-$(CONFIG_QCOM_SCM) += qcom_scm.o obj-$(CONFIG_QCOM_SCM_64) += qcom_scm-64.o obj-$(CONFIG_QCOM_SCM_32) += qcom_scm-32.o |