1. 08 8月, 2008 6 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 3d8cd0c5
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        Move all of include/asm-m68knommu to arch/m68knommu/include/asm.
      3d8cd0c5
    • S
      powerpc/iseries: remove the old viocons driver · 4c514a5a
      Stephen Rothwell 提交于
      This driver was declared obsolete over 2 years ago, the alternative
      console driver for legacy iSeries (hvc_iseries) was made the default
      over 1 year ago and this driver has been build broken for over 3
      months, so remove it.
      Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4c514a5a
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb · b80b601f
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (23 commits)
        V4L/DVB (8617): uvcvideo: don't use stack-based buffers for USB transfers.
        V4L/DVB (8616): uvcvideo: Add support for two Bison Electronics webcams
        V4L/DVB (8611): Add suspend/resume to pxa_camera driver
        V4L/DVB (8610): Add suspend/resume capabilities to soc_camera.
        V4L/DVB (8609): media: Clean up platform_driver_unregister() bogosity.
        V4L/DVB (8607): cxusb: fix OOPS and broken tuning regression on FusionHDTV Dual Digital 4
        V4L/DVB (8605): gspca: Fix of gspca_zc3xx oops - 2.6.27-rc1
        V4L/DVB (8604): gspca: Fix of "scheduling while atomic" crash.
        V4L/DVB (8602): gspca: Fix small bugs, simplify and cleanup ov519.
        V4L/DVB (8582): set mts_firmware for em2882 based Pinnacle Hybrid Pro
        V4L/DVB (8574): gspca: Bad bytesperlines of pixelformat in spca505/506/508 and vc023x.
        V4L/DVB (8573): gspca: Bad scan of frame in spca505/506/508.
        V4L/DVB (8572): gspca: Webcam 0c45:6143 in documentation.
        V4L/DVB (8571): gspca: Don't use CONFIG_VIDEO_ADV_DEBUG as a compile option.
        V4L/DVB (8569): gspca: Set back the old values of Sonix sn9c120 and cleanup source.
        V4L/DVB (8567): gspca: hflip and vflip controls added for ov519 - ov7670 plus init cleanup.
        V4L/DVB (8564): fix vino driver build error
        V4L/DVB (8563): fix drivers/media/video/arv.c compilation
        V4L/DVB (8562): DVB_DRX397XD: remove FW_LOADER select
        V4L/DVB (8558): media/video/Kconfig: fix a typo
        ...
      b80b601f
    • L
      Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · a06dee41
      Linus Torvalds 提交于
      * 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
        hwmon: (it87) Support for 16-bit fan reading in it8705 >= rev 0x03
        hwmon: (it87) Support for 16-bit fan reading in it8712 >= rev 0x07
        hwmon: (hwmon-vid) Add 6-bit vid codes for AMD NPT 0Fh cpus
        hwmon: (hwmon-vid) Trivial format multi-line comments per CodingStyle
        hwmon: ad7414 driver
        hwmon: (thmc50) Add support for critical temperature limits
        hwmon: (adm9240) Remove EXPERIMENTAL dependency
        hwmon: (w83627hf) Drop reset module parameter
        hwmon: (w83627hf) Add pwm_enable sysfs interface
        hwmon: (w83791d) Use fan divisor bits from vbat register
        hwmon: (f71882fg) Delete needless forward declarations
        hwmon: (dme1737) Add support for the SMSC SCH5027
        hwmon: (dme1737) Skip detection if forced
        hwmon: (dme1737) Cleanups
      a06dee41
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · b588e2bb
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (70 commits)
        [WATCHDOG] more coding style clean-up's
        [WATCHDOG] sbc8360.c - move stop code into a function
        [WATCHDOG] Coding style - Indentation - part 2
        [WATCHDOG] Coding style - Indentation - part 1
        [WATCHDOG] mpc8xxx_wdt: add support for MPC8xx watchdogs
        [WATCHDOG] mpc8xxx_wdt: fix build
        [WATCHDOG] mpc8xxx_wdt: various renames, mostly s/mpc83xx/mpc8xxx/g
        [WATCHDOG] mpc83xx_wdt: rename to mpc8xxx_wdt
        [WATCHDOG] mpc83xx_wdt: add support for MPC86xx CPUs
        [WATCHDOG] mpc83xx_wdt: convert to the OF platform driver
        [WATCHDOG] pcwd: a couple of watchdogs escaped conversion
        [WATCHDOG] Clean-up includes
        [WATCHDOG] hpwdt.c - fix double includes
        [WATCHDOG 57/57] wdt501/pci: Clean up, coding style and switch to unlocked_ioctl
        [WATCHDOG 56/57] wdt977: clean up, coding style and switch to unlocked_ioctl
        [WATCHDOG 55/57] wdt285: switch to unlocked_ioctl and tidy up oddments of coding style
        [WATCHDOG 54/57] wdrtas: clean up, coding style, switch to unlocked_ioctl
        [WATCHDOG 53/57] wafer5823wdt: Clean up, coding style, switch to unlocked_ioctl
        [WATCHDOG 52/57] w83977f_wdt: clean up, coding style and switch to unlocked_ioctl
        [WATCHDOG 51/57] w83877f_wdt: clean up code, coding style, switch to unlocked_ioctl
        ...
      b588e2bb
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes · 3df302ff
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
        kbuild: a better way to generate cscope database change
        Kconfig: Extend "menuconfig" for modules to simplify Kconfig file
        bugfix for scripts/patch-kernel in 2.6 sublevel stepping
        kbuild: fix O=.. build with arm
      3df302ff
  2. 07 8月, 2008 30 次提交
  3. 06 8月, 2008 4 次提交
    • W
      [WATCHDOG] sbc8360.c - move stop code into a function · 12b7a152
      Wim Van Sebroeck 提交于
      Move the sbc8360.c watchdog stop code into a seperate function.
      Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
      12b7a152
    • W
      [WATCHDOG] Coding style - Indentation - part 2 · 0c06090c
      Wim Van Sebroeck 提交于
      This brings the watchdog drivers into line with coding style.
      This patch takes cares of the indentation as described in chapter 1.
      Main changes:
      * Re-structure the ioctl switch call for all drivers as follows:
      	switch (cmd) {
      	case WDIOC_GETSUPPORT:
      	case WDIOC_GETSTATUS:
      	case WDIOC_GETBOOTSTATUS:
      	case WDIOC_GETTEMP:
      	case WDIOC_SETOPTIONS:
      	case WDIOC_KEEPALIVE:
      	case WDIOC_SETTIMEOUT:
      	case WDIOC_GETTIMEOUT:
      	case WDIOC_GETTIMELEFT:
      	default:
      	}
      
      This to make the migration from the drivers to the uniform watchdog
      device driver easier in the future.
      Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
      0c06090c
    • W
      [WATCHDOG] Coding style - Indentation - part 1 · 5eb82498
      Wim Van Sebroeck 提交于
      This brings the watchdog drivers into line with coding style.
      This patch takes cares of the indentation as described in chapter 1:
        The preferred way to ease multiple indentation levels in a switch
        statement is to align the "switch" and its subordinate "case"
        labels in the same column instead of "double-indenting" the "case"
        labels.
      Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
      5eb82498
    • A
      [WATCHDOG] mpc8xxx_wdt: add support for MPC8xx watchdogs · 0d7b1014
      Anton Vorontsov 提交于
      The mpc8xxx_wdt driver is using two registers: SWSRR to push magic
      numbers, and SWCRR to control the watchdog.  Both registers are available
      on the MPC8xx, and seem to have the same offsets and semantics as in
      MPC83xx/MPC86xx watchdogs.  The only difference is prescale value.  So
      this driver simply works on the MPC8xx CPUs.
      
      One quirk is needed for the MPC8xx, though.  It has small prescale value
      and slow CPU, so the watchdog resets board prior to the driver has time to
      load.  To solve this we should split initialization in two steps: start
      ping the watchdog early, and register the watchdog userspace interface
      later.
      
      MPC823 seem to be the first CPU in MPC8xx line, so we use fsl,mpc823-wdt
      compatible matching.
      Signed-off-by: NAnton Vorontsov <avorontsov@ru.mvista.com>
      Tested-by: NJochen Friedrich <jochen@scram.de>
      Cc: Kumar Gala <galak@kernel.crashing.org>
      Signed-off-by: NWim Van Sebroeck <wim@iguana.be>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      0d7b1014