1. 21 May, 2010 8 commits
    • Jean Delvare's avatar
      i2c-stub: Expose the default functionality flags · c5aa6928
      Jean Delvare authored
      It is easier to adjust the flags when you know their default value.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Cc: Mark M. Hoffman <mhoffman@lightlink.com>
      c5aa6928
    • Jean Delvare's avatar
      i2c/scx200_acb: Make PCI device ids constant · e624dbd3
      Jean Delvare authored
      Make PCI device ids constant as we just did for many other i2c bus
      drivers already.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Cc: Márton Németh <nm127@freemail.hu>
      e624dbd3
    • Ivo Manca's avatar
      i2c-i801: Fix all checkpatch warnings · 3fb21c64
      Ivo Manca authored
      Fix all checkpatch warnings. No functional changes are made.
      Signed-off-by: default avatarIvo Manca <pinkel@gmail.com>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      3fb21c64
    • Jean Delvare's avatar
      i2c-i801: All newer devices have all the optional features · e0e8398c
      Jean Delvare authored
      Only the oldest devices lack some of the features supported by this
      driver. List them explicitly, and default to all features enabled for
      all other chips, including the ones added through sysfs. This will
      make future driver maintenance easier.
      
      In the unlikely event of a not yet supported device not implementing
      all the features, one can always use the disable_features module
      parameter to prevent the driver from attempting to use them.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Acked-by: default avatarSeth Heasley <seth.heasley@intel.com>
      e0e8398c
    • Jean Delvare's avatar
      i2c-i801: Let the user disable selected driver features · adff687d
      Jean Delvare authored
      Let the user disable selected features normally supported by the
      device. This makes it possible to work around possible driver or
      hardware bugs if the feature in question doesn't work as intended
      for whatever reason.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Cc: Felix Rubinstein <felixru@gmail.com>
      adff687d
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 7a9b1492
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)
        USB: remove unused usb_buffer_alloc and usb_buffer_free macros
        usb: musb: update gfp/slab.h includes
        USB: ftdi_sio: fix legacy SIO-device header
        USB: kl5usb105: reimplement using generic framework
        USB: kl5usb105: minor clean ups
        USB: kl5usb105: fix memory leak
        USB: io_ti: use kfifo to implement write buffering
        USB: io_ti: remove unsused private counter
        USB: ti_usb: use kfifo to implement write buffering
        USB: ir-usb: fix incorrect write-buffer length
        USB: aircable: fix incorrect write-buffer length
        USB: safe_serial: straighten out read processing
        USB: safe_serial: reimplement read using generic framework
        USB: safe_serial: reimplement write using generic framework
        usb-storage: always print quirks
        USB: usb-storage: trivial debug improvements
        USB: oti6858: use port write fifo
        USB: oti6858: use kfifo to implement write buffering
        USB: cypress_m8: use kfifo to implement write buffering
        USB: cypress_m8: remove unused drain define
        ...
      
      Fix up conflicts (due to usb_buffer_alloc/free renaming) in
      	drivers/input/tablet/acecad.c
      	drivers/input/tablet/kbtab.c
      	drivers/input/tablet/wacom_sys.c
      	drivers/media/video/gspca/gspca.c
      	sound/usb/usbaudio.c
      7a9b1492
    • Stephen Rothwell's avatar
      sound: fixup for usb_buffer_alloc/free rename · 3d62e3fd
      Stephen Rothwell authored
      This is needed before the USB merge.
      Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3d62e3fd
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · f8965467
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
        qlcnic: adding co maintainer
        ixgbe: add support for active DA cables
        ixgbe: dcb, do not tag tc_prio_control frames
        ixgbe: fix ixgbe_tx_is_paused logic
        ixgbe: always enable vlan strip/insert when DCB is enabled
        ixgbe: remove some redundant code in setting FCoE FIP filter
        ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
        ixgbe: fix header len when unsplit packet overflows to data buffer
        ipv6: Never schedule DAD timer on dead address
        ipv6: Use POSTDAD state
        ipv6: Use state_lock to protect ifa state
        ipv6: Replace inet6_ifaddr->dead with state
        cxgb4: notify upper drivers if the device is already up when they load
        cxgb4: keep interrupts available when the ports are brought down
        cxgb4: fix initial addition of MAC address
        cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
        cnic: Convert cnic_local_flags to atomic ops.
        can: Fix SJA1000 command register writes on SMP systems
        bridge: fix build for CONFIG_SYSFS disabled
        ARCNET: Limit com20020 PCI ID matches for SOHARD cards
        ...
      
      Fix up various conflicts with pcmcia tree drivers/net/
      {pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
      wireless/orinoco/spectrum_cs.c} and feature removal
      (Documentation/feature-removal-schedule.txt).
      
      Also fix a non-content conflict due to pm_qos_requirement getting
      renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c
      f8965467
  2. 20 May, 2010 32 commits