Merge ../torvalds-2.6/
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 6 Jan 2006 20:59:59 +0000 (12:59 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 6 Jan 2006 20:59:59 +0000 (12:59 -0800)
1  2 
Documentation/feature-removal-schedule.txt
MAINTAINERS
drivers/macintosh/therm_adt746x.c
drivers/macintosh/therm_pm72.c
drivers/macintosh/windfarm_lm75_sensor.c
include/linux/pci_ids.h

@@@ -47,17 -47,6 +47,6 @@@ Who: Paul E. McKenney <paulmck@us.ibm.c
  
  ---------------------------
  
- What: IEEE1394 Audio and Music Data Transmission Protocol driver,
-       Connection Management Procedures driver
- When: November 2005
- Files:        drivers/ieee1394/{amdtp,cmp}*
- Why:  These are incomplete, have never worked, and are better implemented
-       in userland via raw1394 (see http://freebob.sourceforge.net/ for
-       example.)
- Who:  Jody McIntyre <scjody@steamballoon.com>
- ---------------------------
  What: raw1394: requests of type RAW1394_REQ_ISO_SEND, RAW1394_REQ_ISO_LISTEN
  When: November 2005
  Why:  Deprecated in favour of the new ioctl-based rawiso interface, which is
@@@ -82,6 -71,15 +71,6 @@@ Who: Mauro Carvalho Chehab <mchehab@brt
  
  ---------------------------
  
 -What: i2c sysfs name change: in1_ref, vid deprecated in favour of cpu0_vid
 -When: November 2005
 -Files:        drivers/i2c/chips/adm1025.c, drivers/i2c/chips/adm1026.c
 -Why:  Match the other drivers' name for the same function, duplicate names
 -      will be available until removal of old names.
 -Who:  Grant Coady <gcoady@gmail.com>
 -
 ----------------------------
 -
  What: remove EXPORT_SYMBOL(panic_timeout)
  When: April 2006
  Files:        kernel/panic.c
diff --combined MAINTAINERS
@@@ -258,6 -258,13 +258,13 @@@ P:       Ivan Kokshaysk
  M:    ink@jurassic.park.msu.ru
  S:    Maintained for 2.4; PCI support for 2.6.
  
+ AMD GEODE PROCESSOR/CHIPSET SUPPORT
+ P:      Jordan Crouse
+ M:      info-linux@geode.amd.com
+ L:    info-linux@geode.amd.com
+ W:    http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
+ S:    Supported
  APM DRIVER
  P:    Stephen Rothwell
  M:    sfr@canb.auug.org.au
@@@ -554,6 -561,11 +561,11 @@@ W:       http://us1.samba.org/samba/Linux_CIF
  T:    git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
  S:    Supported       
  
+ CONFIGFS
+ P:    Joel Becker
+ M:    Joel Becker <joel.becker@oracle.com>
+ S:    Supported
  CIRRUS LOGIC GENERIC FBDEV DRIVER
  P:    Jeff Garzik
  M:    jgarzik@pobox.com
@@@ -1230,7 -1242,7 +1242,7 @@@ IEEE 1394 SUBSYSTE
  P:    Ben Collins
  M:    bcollins@debian.org
  P:    Jody McIntyre
- M:    scjody@steamballoon.com
+ M:    scjody@modernduck.com
  L:    linux1394-devel@lists.sourceforge.net
  W:    http://www.linux1394.org/
  T:    git kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394.git
@@@ -1240,14 -1252,14 +1252,14 @@@ IEEE 1394 OHCI DRIVE
  P:    Ben Collins
  M:    bcollins@debian.org
  P:    Jody McIntyre
- M:    scjody@steamballoon.com
+ M:    scjody@modernduck.com
  L:    linux1394-devel@lists.sourceforge.net
  W:    http://www.linux1394.org/
  S:    Maintained
  
  IEEE 1394 PCILYNX DRIVER
  P:    Jody McIntyre
- M:    scjody@steamballoon.com
+ M:    scjody@modernduck.com
  L:    linux1394-devel@lists.sourceforge.net
  W:    http://www.linux1394.org/
  S:    Maintained
@@@ -1898,6 -1910,15 +1910,15 @@@ M:    ajoshi@shell.unixbox.co
  L:    linux-nvidia@lists.surfsouth.com
  S:    Maintained
  
+ ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
+ P:    Mark Fasheh
+ M:    mark.fasheh@oracle.com
+ P:    Kurt Hackel
+ M:    kurt.hackel@oracle.com
+ L:    ocfs2-devel@oss.oracle.com
+ W:    http://oss.oracle.com/projects/ocfs2/
+ S:    Supported       
  OLYMPIC NETWORK DRIVER
  P:    Peter De Shrijver
  M:    p2@ace.ulyssis.student.kuleuven.ac.be
@@@ -2902,12 -2923,6 +2923,12 @@@ W:    http://linuxtv.or
  T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
  S:    Maintained
  
 +VT8231 HARDWARE MONITOR DRIVER
 +P:    Roger Lucas
 +M:    roger@planbit.co.uk
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +
  W1 DALLAS'S 1-WIRE BUS
  P:    Evgeniy Polyakov
  M:    johnpol@2ka.mipt.ru
@@@ -52,6 -52,7 +52,7 @@@ static char *sensor_location[3] = {NULL
  
  static int limit_adjust = 0;
  static int fan_speed = -1;
+ static int verbose = 0;
  
  MODULE_AUTHOR("Colin Leroy <colin@colino.net>");
  MODULE_DESCRIPTION("Driver for ADT746x thermostat in iBook G4 and "
@@@ -66,6 -67,10 +67,10 @@@ module_param(fan_speed, int, 0644)
  MODULE_PARM_DESC(fan_speed,"Specify starting fan speed (0-255) "
                 "(default 64)");
  
+ module_param(verbose, bool, 0);
+ MODULE_PARM_DESC(verbose,"Verbose log operations "
+                "(default 0)");
  struct thermostat {
        struct i2c_client       clt;
        u8                      temps[3];
@@@ -149,13 -154,13 +154,13 @@@ detach_thermostat(struct i2c_adapter *a
        if (thread_therm != NULL) {
                kthread_stop(thread_therm);
        }
-               
        printk(KERN_INFO "adt746x: Putting max temperatures back from "
                         "%d, %d, %d to %d, %d, %d\n",
                th->limits[0], th->limits[1], th->limits[2],
                th->initial_limits[0], th->initial_limits[1],
                th->initial_limits[2]);
-       
        for (i = 0; i < 3; i++)
                write_reg(th, LIMIT_REG[i], th->initial_limits[i]);
  
  }
  
  static struct i2c_driver thermostat_driver = {  
 -      .owner          = THIS_MODULE,
 -      .name           = "therm_adt746x",
 -      .flags          = I2C_DF_NOTIFY,
 +      .driver = {
 +              .name   = "therm_adt746x",
 +      },
        .attach_adapter = attach_thermostat,
        .detach_adapter = detach_thermostat,
  };
@@@ -212,12 -217,14 +217,14 @@@ static void write_fan_speed(struct ther
                return;
        
        if (th->last_speed[fan] != speed) {
-               if (speed == -1)
-                       printk(KERN_DEBUG "adt746x: Setting speed to automatic "
-                               "for %s fan.\n", sensor_location[fan+1]);
-               else
-                       printk(KERN_DEBUG "adt746x: Setting speed to %d "
-                               "for %s fan.\n", speed, sensor_location[fan+1]);
+               if (verbose) {
+                       if (speed == -1)
+                               printk(KERN_DEBUG "adt746x: Setting speed to automatic "
+                                       "for %s fan.\n", sensor_location[fan+1]);
+                       else
+                               printk(KERN_DEBUG "adt746x: Setting speed to %d "
+                                       "for %s fan.\n", speed, sensor_location[fan+1]);
+               }
        } else
                return;
        
@@@ -298,10 -305,11 +305,11 @@@ static void update_fans_speed (struct t
                        if (new_speed > 255)
                                new_speed = 255;
  
-                       printk(KERN_DEBUG "adt746x: setting fans speed to %d "
-                                        "(limit exceeded by %d on %s) \n",
-                                       new_speed, var,
-                                       sensor_location[fan_number+1]);
+                       if (verbose)
+                               printk(KERN_DEBUG "adt746x: Setting fans speed to %d "
+                                                "(limit exceeded by %d on %s) \n",
+                                               new_speed, var,
+                                               sensor_location[fan_number+1]);
                        write_both_fan_speed(th, new_speed);
                        th->last_var[fan_number] = var;
                } else if (var < -2) {
                         * so cold (lastvar >= -1) */
                        if (i == 2 && lastvar < -1) {
                                if (th->last_speed[fan_number] != 0)
-                                       printk(KERN_DEBUG "adt746x: Stopping "
-                                               "fans.\n");
+                                       if (verbose)
+                                               printk(KERN_DEBUG "adt746x: Stopping "
+                                                       "fans.\n");
                                write_both_fan_speed(th, 0);
                        }
                }
@@@ -406,7 -415,7 +415,7 @@@ static int attach_one_thermostat(struc
                th->initial_limits[i] = read_reg(th, LIMIT_REG[i]);
                set_limit(th, i);
        }
-       
        printk(KERN_INFO "adt746x: Lowering max temperatures from %d, %d, %d"
                         " to %d, %d, %d\n",
                         th->initial_limits[0], th->initial_limits[1],
@@@ -283,9 -283,9 +283,9 @@@ static int therm_pm72_detach(struct i2c
  
  static struct i2c_driver therm_pm72_driver =
  {
 -      .owner          = THIS_MODULE,
 -      .name           = "therm_pm72",
 -      .flags          = I2C_DF_NOTIFY,
 +      .driver = {
 +              .name   = "therm_pm72",
 +      },
        .attach_adapter = therm_pm72_attach,
        .detach_adapter = therm_pm72_detach,
  };
@@@ -1988,18 -1988,13 +1988,13 @@@ static void fcu_lookup_fans(struct devi
  
  static int fcu_of_probe(struct of_device* dev, const struct of_device_id *match)
  {
-       int rc;
        state = state_detached;
  
        /* Lookup the fans in the device tree */
        fcu_lookup_fans(dev->node);
  
        /* Add the driver */
-       rc = i2c_add_driver(&therm_pm72_driver);
-       if (rc < 0)
-               return rc;
-       return 0;
+       return i2c_add_driver(&therm_pm72_driver);
  }
  
  static int fcu_of_remove(struct of_device* dev)
@@@ -47,9 -47,9 +47,9 @@@ static int wf_lm75_attach(struct i2c_ad
  static int wf_lm75_detach(struct i2c_client *client);
  
  static struct i2c_driver wf_lm75_driver = {
 -      .owner          = THIS_MODULE,
 -      .name           = "wf_lm75",
 -      .flags          = I2C_DF_NOTIFY,
 +      .driver = {
 +              .name   = "wf_lm75",
 +      },
        .attach_adapter = wf_lm75_attach,
        .detach_client  = wf_lm75_detach,
  };
@@@ -240,12 -240,7 +240,7 @@@ static int wf_lm75_detach(struct i2c_cl
  
  static int __init wf_lm75_sensor_init(void)
  {
-       int rc;
-       rc = i2c_add_driver(&wf_lm75_driver);
-       if (rc < 0)
-               return rc;
-       return 0;
+       return i2c_add_driver(&wf_lm75_driver);
  }
  
  static void __exit wf_lm75_sensor_exit(void)
diff --combined include/linux/pci_ids.h
  #define PCI_DEVICE_ID_NS_87410                0xd001
  #define PCI_DEVICE_ID_NS_CS5535_IDE   0x002d
  
+ #define PCI_DEVICE_ID_NS_CS5535_HOST_BRIDGE  0x0028
+ #define PCI_DEVICE_ID_NS_CS5535_ISA_BRIDGE   0x002b
+ #define PCI_DEVICE_ID_NS_CS5535_IDE          0x002d
+ #define PCI_DEVICE_ID_NS_CS5535_AUDIO        0x002e
+ #define PCI_DEVICE_ID_NS_CS5535_USB          0x002f
+ #define PCI_DEVICE_ID_NS_CS5535_VIDEO        0x0030
  #define PCI_VENDOR_ID_TSENG           0x100c
  #define PCI_DEVICE_ID_TSENG_W32P_2    0x3202
  #define PCI_DEVICE_ID_TSENG_W32P_b    0x3205
  
  #define PCI_DEVICE_ID_AMD_CS5536_IDE  0x209A
  
+ #define PCI_DEVICE_ID_AMD_LX_VIDEO  0x2081
+ #define PCI_DEVICE_ID_AMD_LX_AES    0x2082
  #define PCI_VENDOR_ID_TRIDENT         0x1023
  #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX       0x2000
  #define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX       0x2001
  #define PCI_DEVICE_ID_NVIDIA_TNT_UNKNOWN        0x002a
  #define PCI_DEVICE_ID_NVIDIA_VTNT2            0x002C
  #define PCI_DEVICE_ID_NVIDIA_UVTNT2           0x002D
 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SMBUS       0x0034
  #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE 0x0035
  #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_SATA        0x0036
  #define PCI_DEVICE_ID_NVIDIA_NVENET_10                0x0037