Merge branch 'master' into can-usb1

diff --cc lincan/include/can_sysdep.h
Simple merge

diff --cc lincan/include/main.h
Simple merge

diff --cc lincan/include/proc.h
Simple merge

diff --cc lincan/include/setup.h
index d07e3fda26637b14fd6f43c5390b688e7a389559,f7d4e54cb41ce99a074d6fc259723bfe1b25d421..300c486fdef732c1f2ca2a461a7c0bd5fc274d21
--- 1/lincan/include/setup.h
--- 2/lincan/include/setup.h
+++ b/lincan/include/setup.h
@@@ -1,14 -1,38 +1,39 @@@
- /* setup.h
-  * Header file for the Linux CAN-bus driver.
-  * Written by Arnaud Westenberg email:arnaud@wanadoo.nl
-  * Rewritten for new CAN queues by Pavel Pisa - OCERA team member
-  * email:pisa@cmp.felk.cvut.cz
-  * This software is released under the GPL-License.
-  * Version lincan-0.3  17 Jun 2004
-  */
+ /**************************************************************************/
+ /* File: setup.h - CAN driver and chips setup code                        */
+ /*                                                                        */
+ /* LinCAN - (Not only) Linux CAN bus driver                               */
+ /* Copyright (C) 2002-2009 DCE FEE CTU Prague <http://dce.felk.cvut.cz>   */
+ /* Copyright (C) 2002-2009 Pavel Pisa <pisa@cmp.felk.cvut.cz>             */
+ /* Funded by OCERA and FRESCOR IST projects                               */
+ /* Based on CAN driver code by Arnaud Westenberg <arnaud@wanadoo.nl>      */
+ /*                                                                        */
+ /* LinCAN is free software; you can redistribute it and/or modify it      */
+ /* under terms of the GNU General Public License as published by the      */
+ /* Free Software Foundation; either version 2, or (at your option) any    */
+ /* later version.  LinCAN 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 LinCAN; see file     */
+ /* COPYING. If not, write to the Free Software Foundation, 675 Mass Ave,  */
+ /* Cambridge, MA 02139, USA.                                              */
+ /*                                                                        */
+ /* To allow use of LinCAN in the compact embedded systems firmware        */
+ /* and RT-executives (RTEMS for example), main authors agree with next    */
+ /* special exception:                                                     */
+ /*                                                                        */
+ /* Including LinCAN header files in a file, instantiating LinCAN generics */
+ /* or templates, or linking other files with LinCAN objects to produce    */
+ /* an application image/executable, does not by itself cause the          */
+ /* resulting application image/executable to be covered by                */
+ /* the GNU General Public License.                                        */
+ /* This exception does not however invalidate any other reasons           */
+ /* why the executable file might be covered by the GNU Public License.    */
+ /* Publication of enhanced or derived LinCAN files is required although.  */
+ /**************************************************************************/
  
  int init_hw_struct(void);
 +int init_new_hw_struct(int devnr);
  int list_hw(void);
  void *can_checked_malloc(size_t size);
  int can_checked_free(void *address_p);

diff --cc lincan/src/finish.c
Simple merge

diff --cc lincan/src/main.c
Simple merge

diff --cc lincan/src/modparms.c
Simple merge

diff --cc lincan/src/proc.c
Simple merge

diff --cc lincan/src/setup.c
Simple merge