1. 01 Aug, 2007 8 commits
    • David Lamparter's avatar
      sis5513: Add FSC Amilo A1630 PCI subvendor/dev to laptops · 1955f681
      David Lamparter authored
      Recognise the FSC Amilo A1630's incarnation of a SiS5513 chip as laptop to
      get UDMA100 support.
      Signed-off-by: default avatarDavid Lamparter <equinox@diac24.net>
      Cc: Lionel Bouton <Lionel.Bouton@inet6.fr>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      1955f681
    • Bartlomiej Zolnierkiewicz's avatar
      alim15x3: Correct HP detect · 8663fd6d
      Bartlomiej Zolnierkiewicz authored
      Direct port of Alan's fix for pata_ali.
      
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      8663fd6d
    • Jordan Crouse's avatar
      ide: Fix an overrun found in the CS5535 IDE driver · 32a70a81
      Jordan Crouse authored
      As found by the Coverity checker, and reported by Adrian Bunk, this
      fixes a overrun error in the CS5535 IDE driver.  Somebody got a little
      excited with the if() statement - the CS5535 only supports UDMA 0-4.
      
      Bart:
      Not a bug per se since the upper layer will never feed this function
      with speed > XFER_UDMA_4 (thanks to ->ultra_mask being set to 0x1f).
      
      Worth fixing anyway.
      Signed-off-by: default avatarJordan Crouse <jordan.crouse@amd.com>
      Cc: Adrian Bunk <bunk@stusta.de>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      32a70a81
    • Linus Torvalds's avatar
      Fix WARN_ON() on bitfield ops · 8d4fbcfb
      Linus Torvalds authored
      Alexey Dobriyan noticed that the new WARN_ON() semantics that were
      introduced by commit 684f9783 (to also
      return the value to be warned on) didn't compile when given a bitfield,
      because the typeof doesn't work for bitfields.
      
      So instead of the typeof trick, use an "int" variable together with a
      "!!(x)" expression, as suggested by Al Viro.
      
      To make matters more interesting, Paul Mackerras points out that that is
      sub-optimal on Power, but the old asm-coded comparison seems to be buggy
      anyway on 32-bit Power if the conditional was 64-bit, so I think there
      are more problems there.
      
      Regardless, the new WARN_ON() semantics may have been a bad idea.  But
      this at least avoids the more serious complications.
      
      Cc: Alexey Dobriyan <adobriyan@sw.ru>
      Cc: Herbert Xu <herbert@gondor.apana.org.au>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Al Viro <viro@ftp.linux.org.uk>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Andrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      8d4fbcfb
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 2f63251e
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (28 commits)
        [WATCHDOG] Fix pcwd_init_module crash
        [WATCHDOG] ICH9 support for iTCO_wdt
        [WATCHDOG] 631xESB/632xESB support for iTCO_wdt - add all LPC bridges
        [WATCHDOG] 631xESB/632xESB support for iTCO_wdt
        [WATCHDOG] omap_wdt.c - default error for IOCTL is -ENOTTY
        [WATCHDOG] Return value of nonseekable_open
        [WATCHDOG] mv64x60_wdt: Rework the timeout register manipulation
        [WATCHDOG] mv64x60_wdt: disable watchdog timer when driver is probed
        [WATCHDOG] mv64x60_wdt: Support the WDIOF_MAGICCLOSE feature
        [WATCHDOG] mv64x60_wdt: Add a module parameter to change nowayout setting
        [WATCHDOG] mv64x60_wdt: Add WDIOC_SETOPTIONS ioctl support
        [WATCHDOG] mv64x60_wdt: Support for WDIOC_SETTIMEOUT ioctl
        [WATCHDOG] mv64x60_wdt: Fix WDIOC_GETTIMEOUT return value
        [WATCHDOG] mv64x60_wdt: Check return value of nonseekable_open
        [WATCHDOG] mv64x60_wdt: Add arch/powerpc platform support
        [WATCHDOG] mv64x60_wdt: Get register address from platform data
        [WATCHDOG] mv64x60_wdt: set up platform_device in platform code
        [WATCHDOG] ensure mouse and keyboard ignored in w83627hf_wdt
        [WATCHDOG] s3c2410_wdt: fixup after arch include moves
        [WATCHDOG] git-watchdog-typo
        ...
      2f63251e
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · d6dd9e93
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (50 commits)
        [MIPS] Add smp_call_function_single()
        [MIPS] thread_info.h: kmalloc + memset conversion to kzalloc
        [MIPS] Kexec: Fix several 64-bit bugs.
        [MIPS] Kexec: Fix several warnings.
        [MIPS] DDB5477: Remove support
        [MIPS] Fulong: Remove unneeded header file
        [MIPS] Cobalt: Enable UART on RaQ1
        [MIPS] Remove unused GROUP_TOSHIBA_NAMES
        [MIPS] remove some duplicate includes
        [MIPS] Oprofile: Fix rm9000 performance counter handler
        [MIPS] Use -Werror on subdirectories which build cleanly.
        [MIPS] Yosemite: Fix warning.
        [MIPS] PMON: Fix cpustart declaration.
        [MIPS] Yosemite: Only build ll_ht_smp_irq_handler() if HYPERTRANSPORT.
        [MIPS] Yosemite: Fix build error due to undeclared titan_mailbox_irq().
        [MIPS] Yosemite: Don't declare titan_mailbox_irq() as asmlinkage.
        [MIPS] Yosemite: Fix warnings in i2c-yoesmite by deleting the unused code.
        [MIPS] Delete unused arch/mips/gt64120/common/
        [MIPS] Fix build warning in unaligned load/store emulator.
        [MIPS] IP32: Don't ignore request_irq's return value.
        ...
      d6dd9e93
    • Linus Torvalds's avatar
      Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 · dd9cd6d4
      Linus Torvalds authored
      * 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
        hwmon: fscher read control bugfix
        hwmon: (adm1031) Fix broken links in documentation
        hwmon: make abituguru3_read_increment_offset() static
        hwmon: Fix regression caused by typo in lm90.c
        hwmon: (applesmc) add temperature sensors set for Macbook
        hwmon: fscher control update bugfix
        hwmon: fix dme1737 temp fault attribute
        hwmon: Add missing __devexit tags in various drivers
        hwmon: clean up duplicate includes
        hwmon: fix lm78 detection regression
        hwmon: fix array overruns in lm93.c
        hwmon: add support for THMC50 and ADM1022
      dd9cd6d4
    • Len Brown's avatar
      ACPI: delete CONFIG_ACPI_PROCFS_SLEEP (again) · 128a2bcf
      Len Brown authored
      CONFIG_ACPI_PROCFS_SLEEP is a NO-OP -- delete it (again).
      
      Apparently 296699de creating CONFIG_SUSPEND
      and CONFIG_PM_SLEEP was based on an out-dated version of drivers/acpi/Kconfig,
      as it erroneously restored this recently deleted config option.
      Signed-off-by: default avatarLen Brown <len.brown@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      128a2bcf
  2. 31 Jul, 2007 32 commits