Cleanup in preparation for merge

Fix trailing whitespace
Use standard include guards
Add more missing config.h includes
Fixup emacs mode strings
Update copyright notices

1 files changed, 7 insertions, 7 deletions

diff --git a/usrp/host/lib/usrp_primsi.h b/usrp/host/lib/usrp_primsi.h
index 83cc31aee..b1cf7263a 100644
--- a/usrp/host/lib/usrp_primsi.h
+++ b/usrp/host/lib/usrp_primsi.h
@@ -1,19 +1,19 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2003 Free Software Foundation, Inc.
- * 
+ * Copyright 2003,2009 Free Software Foundation, Inc.
+ *
  * This file is part of GNU Radio
- * 
+ *
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
- * 
+ *
  * GNU Radio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with GNU Radio; see the file COPYING.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street,
@@ -30,7 +30,7 @@
 #include "usrp/usrp_prims.h"
 
 /*
- * Internal functions 
+ * Internal functions
  */
 
 libusb_device_handle *
@@ -40,7 +40,7 @@ int write_cmd (libusb_device_handle *udh, int request, int value, int index,
                unsigned char *bytes, int len);
 
 /*
- * Compatibility functions 
+ * Compatibility functions
  */
 
 libusb_device *_get_usb_device (libusb_device_handle *udh);