Merge branch 'master' into ide-1.5.x

2 files changed, 7 insertions, 2 deletions

diff --git a/cores/arduino/CDC.cpp b/cores/arduino/CDC.cpp
index fb25a96..a691306 100644
--- a/cores/arduino/CDC.cpp
+++ b/cores/arduino/CDC.cpp
@@ -115,7 +115,11 @@ bool WEAK CDC_Setup(Setup& setup)
 
 
 int _serialPeek = -1;
-void Serial_::begin(uint16_t baud_count)
+void Serial_::begin(unsigned long baud_count)
+{
+}
+
+void Serial_::begin(unsigned long baud_count, byte config)
 {
 }
 
diff --git a/cores/arduino/USBAPI.h b/cores/arduino/USBAPI.h
index cabecf3..da2e869 100644
--- a/cores/arduino/USBAPI.h
+++ b/cores/arduino/USBAPI.h
@@ -36,7 +36,8 @@ struct ring_buffer;
 class Serial_ : public Stream
 {
 public:
-	void begin(uint16_t baud_count);
+	void begin(unsigned long);
+	void begin(unsigned long, uint8_t);
 	void end(void);
 
 	virtual int available(void);