diff options
author | Stefan Wahren <stefan.wahren@i2se.com> | 2018-04-28 18:47:45 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-07 05:04:43 +0300 |
commit | 0b55753f55c7a93c250bee4a736d77d7c83db953 (patch) | |
tree | 6bb7817b2c662054e6ac625807697d30ad42eff2 /drivers/staging | |
parent | b0ae3f55758ff661b239a1240a30e49584c87ac4 (diff) | |
download | linux-0b55753f55c7a93c250bee4a736d77d7c83db953.tar.xz |
staging: vc04_services: Remove defines from Makefile
The definition of USE_VCHIQ_ARM and VCOS_VERIFY_BKPTS isn't really necessary
so remove them.
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/vc04_services/Makefile | 2 | ||||
-rw-r--r-- | drivers/staging/vc04_services/interface/vchi/vchi_common.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile index fb26b826e640..afe43fa5a6d7 100644 --- a/drivers/staging/vc04_services/Makefile +++ b/drivers/staging/vc04_services/Makefile @@ -13,5 +13,5 @@ vchiq-objs := \ obj-$(CONFIG_SND_BCM2835) += bcm2835-audio/ obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-camera/ -ccflags-y += -DVCOS_VERIFY_BKPTS=1 -Idrivers/staging/vc04_services -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 +ccflags-y += -Idrivers/staging/vc04_services -D__VCCOREVER__=0x04000000 diff --git a/drivers/staging/vc04_services/interface/vchi/vchi_common.h b/drivers/staging/vc04_services/interface/vchi/vchi_common.h index 76e10fe65d9b..8eb2bb9f0fe2 100644 --- a/drivers/staging/vc04_services/interface/vchi/vchi_common.h +++ b/drivers/staging/vc04_services/interface/vchi/vchi_common.h @@ -97,12 +97,10 @@ typedef enum { VCHI_CALLBACK_PEER_RESUMED, VCHI_CALLBACK_FORCED_POWER_OFF, -#ifdef USE_VCHIQ_ARM // some extra notifications provided by vchiq_arm VCHI_CALLBACK_SERVICE_OPENED, VCHI_CALLBACK_BULK_RECEIVE_ABORTED, VCHI_CALLBACK_BULK_TRANSMIT_ABORTED, -#endif VCHI_CALLBACK_REASON_MAX } VCHI_CALLBACK_REASON_T; |