Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: vc04_services: use bcm2835 consequently

The naming bcm2708 is used only in the vendor kernel, so better
replace it with bcm2835 which is used in mainline in order
to avoid any confusion.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Stefan Wahren and committed by
Greg Kroah-Hartman
32774ef3 801b1aa0

+4 -4
+1 -1
drivers/staging/Makefile
··· 41 41 obj-$(CONFIG_ISDN_I4L) += i4l/ 42 42 obj-$(CONFIG_KS7010) += ks7010/ 43 43 obj-$(CONFIG_GREYBUS) += greybus/ 44 - obj-$(CONFIG_BCM2708_VCHIQ) += vc04_services/ 44 + obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/
+2 -2
drivers/staging/vc04_services/Kconfig
··· 1 - config BCM2708_VCHIQ 1 + config BCM2835_VCHIQ 2 2 tristate "Videocore VCHIQ" 3 3 depends on RASPBERRYPI_FIRMWARE && BROKEN 4 4 default y 5 5 help 6 6 Kernel to VideoCore communication interface for the 7 - BCM2708 family of products. 7 + BCM2835 family of products. 8 8 Defaults to Y when the Broadcom Videocore services 9 9 are included in the build, N otherwise.
+1 -1
drivers/staging/vc04_services/Makefile
··· 1 - obj-$(CONFIG_BCM2708_VCHIQ) += vchiq.o 1 + obj-$(CONFIG_BCM2835_VCHIQ) += vchiq.o 2 2 3 3 vchiq-objs := \ 4 4 interface/vchiq_arm/vchiq_core.o \