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>

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 2fa9745db6144ef4b744eb57514c5bf400279a1a..323753216999e5247d3b45d41c6f29c7691a9844 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -41,4 +41,4 @@ obj-$(CONFIG_MOST)            += most/
 obj-$(CONFIG_ISDN_I4L)         += i4l/
 obj-$(CONFIG_KS7010)           += ks7010/
 obj-$(CONFIG_GREYBUS)          += greybus/
-obj-$(CONFIG_BCM2708_VCHIQ)    += vc04_services/
+obj-$(CONFIG_BCM2835_VCHIQ)    += vc04_services/

diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig
index 9676fb29075a457109e4d4235f086987aec74868..f839a542a2fff16459df0873efa0c9deaa571d32 100644 (file)
--- a/drivers/staging/vc04_services/Kconfig
+++ b/drivers/staging/vc04_services/Kconfig
@@ -1,9 +1,9 @@
-config BCM2708_VCHIQ
+config BCM2835_VCHIQ
        tristate "Videocore VCHIQ"
        depends on RASPBERRYPI_FIRMWARE && BROKEN
        default y
        help
                Kernel to VideoCore communication interface for the
-               BCM2708 family of products.
+               BCM2835 family of products.
                Defaults to Y when the Broadcom Videocore services
                are included in the build, N otherwise.

diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile
index 90ab4781df2cdffcd7dd8f3b6ae81ba41209cfd0..1a9e742ee40d2ef152817999ad1c931357e793df 100644 (file)
--- a/drivers/staging/vc04_services/Makefile
+++ b/drivers/staging/vc04_services/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_BCM2708_VCHIQ)    += vchiq.o
+obj-$(CONFIG_BCM2835_VCHIQ)    += vchiq.o
 
 vchiq-objs := \
    interface/vchiq_arm/vchiq_core.o  \