diff --git a/core/dev/cc2420.c b/core/dev/cc2420.c
index 2f742c3ed..e05ebfc2a 100644
--- a/core/dev/cc2420.c
+++ b/core/dev/cc2420.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: cc2420.c,v 1.59 2010/09/22 22:01:53 adamdunkels Exp $
+ * @(#)$Id: cc2420.c,v 1.60 2010/09/23 08:26:06 nifi Exp $
  */
 /*
  * This code is almost device independent and should be easy to port.
@@ -146,8 +146,8 @@ const struct radio_driver cc2420_driver =
     cc2420_transmit,
     cc2420_send,
     cc2420_read,
-    cc2420_set_channel,
-    detected_energy,
+    /* cc2420_set_channel, */
+    /* detected_energy, */
     cc2420_cca,
     cc2420_receiving_packet,
     pending_packet,
@@ -796,11 +796,13 @@ cc2420_rssi(void)
   return rssi;
 }
 /*---------------------------------------------------------------------------*/
+/*
 static int
 detected_energy(void)
 {
   return cc2420_rssi();
 }
+*/
 /*---------------------------------------------------------------------------*/
 int
 cc2420_cca_valid(void)
diff --git a/core/dev/cc2420.h b/core/dev/cc2420.h
index 3a1008024..c96957487 100644
--- a/core/dev/cc2420.h
+++ b/core/dev/cc2420.h
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: cc2420.h,v 1.12 2010/06/24 11:25:07 nifi Exp $
+ * $Id: cc2420.h,v 1.13 2010/09/23 08:26:06 nifi Exp $
  */
 
 /**
@@ -51,7 +51,7 @@ int cc2420_init(void);
 
 #define CC2420_MAX_PACKET_LEN      127
 
-void cc2420_set_channel(int channel);
+int cc2420_set_channel(int channel);
 int cc2420_get_channel(void);
 
 void cc2420_set_pan_addr(unsigned pan,