From cc76c649b1413438cc4c0dd13d37efb6b00306a7 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Fri, 27 Apr 2012 11:49:47 +0100 Subject: [PATCH] The cc2530 button driver would fail to compile if the user disabled button support --- platform/cc2530dk/dev/button-sensor.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/platform/cc2530dk/dev/button-sensor.h b/platform/cc2530dk/dev/button-sensor.h index ad9bcc27d..6fd1a2fb5 100644 --- a/platform/cc2530dk/dev/button-sensor.h +++ b/platform/cc2530dk/dev/button-sensor.h @@ -69,14 +69,12 @@ #endif /* BUTTON_SENSOR_CONF_ON */ #define button_sensor button_1_sensor +extern const struct sensors_sensor button_1_sensor; +extern const struct sensors_sensor button_2_sensor; #if BUTTON_SENSOR_ON -/* Common */ -extern const struct sensors_sensor button_1_sensor; - #if MODEL_CC2531 /* USB Dongle */ -extern const struct sensors_sensor button_2_sensor; /* Buttons: P1_2 & P1_3 - Port 1 ISR needed */ void port_1_isr(void) __interrupt(P1INT_VECTOR); #define BUTTON_SENSOR_ACTIVATE() do { \