Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits) vlynq: make whole Kconfig-menu dependant on architecture add descriptive comment for TIF_MEMDIE task flag declaration. EEPROM: max6875: Header file cleanup EEPROM: 93cx6: Header file cleanup EEPROM: Header file cleanup agp: use NULL instead of 0 when pointer is needed rtc-v3020: make bitfield unsigned PCI: make bitfield unsigned jbd2: use NULL instead of 0 when pointer is needed cciss: fix shadows sparse warning doc: inode uses a mutex instead of a semaphore. uml: i386: Avoid redefinition of NR_syscalls fix "seperate" typos in comments cocbalt_lcdfb: correct sections doc: Change urls for sparse Powerpc: wii: Fix typo in comment i2o: cleanup some exit paths Documentation/: it's -> its where appropriate UML: Fix compiler warning due to missing task_struct declaration UML: add kernel.h include to signal.c ...
This commit is contained in:
Linus Torvalds
@@ -1,24 +1,20 @@
|
||||
/*
|
||||
Copyright (C) 1998, 1999 Frodo Looijaard <frodol@dds.nl> and
|
||||
Philip Edelbrock <phil@netroedge.com>
|
||||
Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
|
||||
Copyright (C) 2003 IBM Corp.
|
||||
Copyright (C) 2004 Jean Delvare <khali@linux-fr.org>
|
||||
|
||||
This program 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 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program 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 this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
* Copyright (C) 1998, 1999 Frodo Looijaard <frodol@dds.nl> and
|
||||
* Philip Edelbrock <phil@netroedge.com>
|
||||
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
|
||||
* Copyright (C) 2003 IBM Corp.
|
||||
* Copyright (C) 2004 Jean Delvare <khali@linux-fr.org>
|
||||
*
|
||||
* This program 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 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program 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.
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
|
||||
@@ -1,27 +1,20 @@
|
||||
/*
|
||||
Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
|
||||
<http://rt2x00.serialmonkey.com>
|
||||
|
||||
This program 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 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program 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 this program; if not, write to the
|
||||
Free Software Foundation, Inc.,
|
||||
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/*
|
||||
Module: eeprom_93cx6
|
||||
Abstract: EEPROM reader routines for 93cx6 chipsets.
|
||||
Supported chipsets: 93c46 & 93c66.
|
||||
* Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
|
||||
* <http://rt2x00.serialmonkey.com>
|
||||
*
|
||||
* This program 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 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program 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.
|
||||
*
|
||||
* Module: eeprom_93cx6
|
||||
* Abstract: EEPROM reader routines for 93cx6 chipsets.
|
||||
* Supported chipsets: 93c46 & 93c66.
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
|
||||
@@ -1,30 +1,30 @@
|
||||
/*
|
||||
max6875.c - driver for MAX6874/MAX6875
|
||||
|
||||
Copyright (C) 2005 Ben Gardner <bgardner@wabtec.com>
|
||||
|
||||
Based on eeprom.c
|
||||
|
||||
The MAX6875 has a bank of registers and two banks of EEPROM.
|
||||
Address ranges are defined as follows:
|
||||
* 0x0000 - 0x0046 = configuration registers
|
||||
* 0x8000 - 0x8046 = configuration EEPROM
|
||||
* 0x8100 - 0x82FF = user EEPROM
|
||||
|
||||
This driver makes the user EEPROM available for read.
|
||||
|
||||
The registers & config EEPROM should be accessed via i2c-dev.
|
||||
|
||||
The MAX6875 ignores the lowest address bit, so each chip responds to
|
||||
two addresses - 0x50/0x51 and 0x52/0x53.
|
||||
|
||||
Note that the MAX6875 uses i2c_smbus_write_byte_data() to set the read
|
||||
address, so this driver is destructive if loaded for the wrong EEPROM chip.
|
||||
|
||||
This program 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; version 2 of the License.
|
||||
*/
|
||||
* max6875.c - driver for MAX6874/MAX6875
|
||||
*
|
||||
* Copyright (C) 2005 Ben Gardner <bgardner@wabtec.com>
|
||||
*
|
||||
* Based on eeprom.c
|
||||
*
|
||||
* The MAX6875 has a bank of registers and two banks of EEPROM.
|
||||
* Address ranges are defined as follows:
|
||||
* * 0x0000 - 0x0046 = configuration registers
|
||||
* * 0x8000 - 0x8046 = configuration EEPROM
|
||||
* * 0x8100 - 0x82FF = user EEPROM
|
||||
*
|
||||
* This driver makes the user EEPROM available for read.
|
||||
*
|
||||
* The registers & config EEPROM should be accessed via i2c-dev.
|
||||
*
|
||||
* The MAX6875 ignores the lowest address bit, so each chip responds to
|
||||
* two addresses - 0x50/0x51 and 0x52/0x53.
|
||||
*
|
||||
* Note that the MAX6875 uses i2c_smbus_write_byte_data() to set the read
|
||||
* address, so this driver is destructive if loaded for the wrong EEPROM chip.
|
||||
*
|
||||
* This program 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; version 2 of the License.
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
|
||||
Reference in New Issue
Block a user