diff options
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/eeprom/eeprom.c | 36 | ||||
-rw-r--r-- | drivers/misc/eeprom/eeprom_93cx6.c | 39 | ||||
-rw-r--r-- | drivers/misc/eeprom/max6875.c | 52 | ||||
-rw-r--r-- | drivers/misc/vmware_balloon.c | 4 |
4 files changed, 60 insertions, 71 deletions
diff --git a/drivers/misc/eeprom/eeprom.c b/drivers/misc/eeprom/eeprom.c index f939ebc2507..e306a8cd2f9 100644 --- a/drivers/misc/eeprom/eeprom.c +++ b/drivers/misc/eeprom/eeprom.c | |||
@@ -1,24 +1,20 @@ | |||
1 | /* | 1 | /* |
2 | Copyright (C) 1998, 1999 Frodo Looijaard <frodol@dds.nl> and | 2 | * Copyright (C) 1998, 1999 Frodo Looijaard <frodol@dds.nl> and |
3 | Philip Edelbrock <phil@netroedge.com> | 3 | * Philip Edelbrock <phil@netroedge.com> |
4 | Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com> | 4 | * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com> |
5 | Copyright (C) 2003 IBM Corp. | 5 | * Copyright (C) 2003 IBM Corp. |
6 | Copyright (C) 2004 Jean Delvare <khali@linux-fr.org> | 6 | * Copyright (C) 2004 Jean Delvare <khali@linux-fr.org> |
7 | 7 | * | |
8 | This program is free software; you can redistribute it and/or modify | 8 | * This program is free software; you can redistribute it and/or modify |
9 | it under the terms of the GNU General Public License as published by | 9 | * it under the terms of the GNU General Public License as published by |
10 | the Free Software Foundation; either version 2 of the License, or | 10 | * the Free Software Foundation; either version 2 of the License, or |
11 | (at your option) any later version. | 11 | * (at your option) any later version. |
12 | 12 | * | |
13 | This program is distributed in the hope that it will be useful, | 13 | * This program is distributed in the hope that it will be useful, |
14 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | GNU General Public License for more details. | 16 | * GNU General Public License for more details. |
17 | 17 | */ | |
18 | You should have received a copy of the GNU General Public License | ||
19 | along with this program; if not, write to the Free Software | ||
20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
21 | */ | ||
22 | 18 | ||
23 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
24 | #include <linux/init.h> | 20 | #include <linux/init.h> |
diff --git a/drivers/misc/eeprom/eeprom_93cx6.c b/drivers/misc/eeprom/eeprom_93cx6.c index 15b1780025c..7b33de95c4b 100644 --- a/drivers/misc/eeprom/eeprom_93cx6.c +++ b/drivers/misc/eeprom/eeprom_93cx6.c | |||
@@ -1,27 +1,20 @@ | |||
1 | /* | 1 | /* |
2 | Copyright (C) 2004 - 2006 rt2x00 SourceForge Project | 2 | * Copyright (C) 2004 - 2006 rt2x00 SourceForge Project |
3 | <http://rt2x00.serialmonkey.com> | 3 | * <http://rt2x00.serialmonkey.com> |
4 | 4 | * | |
5 | This program is free software; you can redistribute it and/or modify | 5 | * This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | * it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | * the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | * (at your option) any later version. |
9 | 9 | * | |
10 | This program is distributed in the hope that it will be useful, | 10 | * This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | * GNU General Public License for more details. |
14 | 14 | * | |
15 | You should have received a copy of the GNU General Public License | 15 | * Module: eeprom_93cx6 |
16 | along with this program; if not, write to the | 16 | * Abstract: EEPROM reader routines for 93cx6 chipsets. |
17 | Free Software Foundation, Inc., | 17 | * Supported chipsets: 93c46 & 93c66. |
18 | 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
19 | */ | ||
20 | |||
21 | /* | ||
22 | Module: eeprom_93cx6 | ||
23 | Abstract: EEPROM reader routines for 93cx6 chipsets. | ||
24 | Supported chipsets: 93c46 & 93c66. | ||
25 | */ | 18 | */ |
26 | 19 | ||
27 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
diff --git a/drivers/misc/eeprom/max6875.c b/drivers/misc/eeprom/max6875.c index 5a6b2bce8ad..fe290927850 100644 --- a/drivers/misc/eeprom/max6875.c +++ b/drivers/misc/eeprom/max6875.c | |||
@@ -1,30 +1,30 @@ | |||
1 | /* | 1 | /* |
2 | max6875.c - driver for MAX6874/MAX6875 | 2 | * max6875.c - driver for MAX6874/MAX6875 |
3 | 3 | * | |
4 | Copyright (C) 2005 Ben Gardner <bgardner@wabtec.com> | 4 | * Copyright (C) 2005 Ben Gardner <bgardner@wabtec.com> |
5 | 5 | * | |
6 | Based on eeprom.c | 6 | * Based on eeprom.c |
7 | 7 | * | |
8 | The MAX6875 has a bank of registers and two banks of EEPROM. | 8 | * The MAX6875 has a bank of registers and two banks of EEPROM. |
9 | Address ranges are defined as follows: | 9 | * Address ranges are defined as follows: |
10 | * 0x0000 - 0x0046 = configuration registers | 10 | * * 0x0000 - 0x0046 = configuration registers |
11 | * 0x8000 - 0x8046 = configuration EEPROM | 11 | * * 0x8000 - 0x8046 = configuration EEPROM |
12 | * 0x8100 - 0x82FF = user EEPROM | 12 | * * 0x8100 - 0x82FF = user EEPROM |
13 | 13 | * | |
14 | This driver makes the user EEPROM available for read. | 14 | * This driver makes the user EEPROM available for read. |
15 | 15 | * | |
16 | The registers & config EEPROM should be accessed via i2c-dev. | 16 | * The registers & config EEPROM should be accessed via i2c-dev. |
17 | 17 | * | |
18 | The MAX6875 ignores the lowest address bit, so each chip responds to | 18 | * The MAX6875 ignores the lowest address bit, so each chip responds to |
19 | two addresses - 0x50/0x51 and 0x52/0x53. | 19 | * two addresses - 0x50/0x51 and 0x52/0x53. |
20 | 20 | * | |
21 | Note that the MAX6875 uses i2c_smbus_write_byte_data() to set the read | 21 | * Note that the MAX6875 uses i2c_smbus_write_byte_data() to set the read |
22 | address, so this driver is destructive if loaded for the wrong EEPROM chip. | 22 | * address, so this driver is destructive if loaded for the wrong EEPROM chip. |
23 | 23 | * | |
24 | This program is free software; you can redistribute it and/or modify | 24 | * This program is free software; you can redistribute it and/or modify |
25 | it under the terms of the GNU General Public License as published by | 25 | * it under the terms of the GNU General Public License as published by |
26 | the Free Software Foundation; version 2 of the License. | 26 | * the Free Software Foundation; version 2 of the License. |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
diff --git a/drivers/misc/vmware_balloon.c b/drivers/misc/vmware_balloon.c index e7161c4e379..db9cd0240c6 100644 --- a/drivers/misc/vmware_balloon.c +++ b/drivers/misc/vmware_balloon.c | |||
@@ -41,7 +41,7 @@ | |||
41 | #include <linux/workqueue.h> | 41 | #include <linux/workqueue.h> |
42 | #include <linux/debugfs.h> | 42 | #include <linux/debugfs.h> |
43 | #include <linux/seq_file.h> | 43 | #include <linux/seq_file.h> |
44 | #include <asm/vmware.h> | 44 | #include <asm/hypervisor.h> |
45 | 45 | ||
46 | MODULE_AUTHOR("VMware, Inc."); | 46 | MODULE_AUTHOR("VMware, Inc."); |
47 | MODULE_DESCRIPTION("VMware Memory Control (Balloon) Driver"); | 47 | MODULE_DESCRIPTION("VMware Memory Control (Balloon) Driver"); |
@@ -767,7 +767,7 @@ static int __init vmballoon_init(void) | |||
767 | * Check if we are running on VMware's hypervisor and bail out | 767 | * Check if we are running on VMware's hypervisor and bail out |
768 | * if we are not. | 768 | * if we are not. |
769 | */ | 769 | */ |
770 | if (!vmware_platform()) | 770 | if (x86_hyper != &x86_hyper_vmware) |
771 | return -ENODEV; | 771 | return -ENODEV; |
772 | 772 | ||
773 | vmballoon_wq = create_freezeable_workqueue("vmmemctl"); | 773 | vmballoon_wq = create_freezeable_workqueue("vmmemctl"); |