1. 11 May, 2007 38 commits
  2. 10 May, 2007 2 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · a9deecba
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        [WATCHDOG] MTX-1 Watchdog driver
        [WATCHDOG] s3c2410_wdt - initialize watchdog irq resource  
        [WATCHDOG] Kconfig menuconfig patch
        [WATCHDOG] pcwd.c: Port to the new device driver model
        [WATCHDOG] use mutex instead of semaphore in Berkshire USB-PC Watchdog driver
        [WATCHDOG] the scheduled removal of the i8xx_tco watchdog driver
        [WATCHDOG] Semi-typical watchdog bug re early misc_register()
        [WATCHDOG] add support for the w83627thf chipset.
      a9deecba
    • Simon Horman's avatar
      Allow compat_ioctl.c to compile without CONFIG_NET · d9de2622
      Simon Horman authored
      A small regression appears to have been introduced in the recent patch
      "cleanup compat ioctl handling", which was included in Linus' tree after
      2.6.20.
      
      siocdevprivate_ioctl() is no longer defined if CONFIG_NET is undefined,
      whereas previously it was a dummy function in this case.
      
      This causes compilation with CONFIG_COMPAT but without CONFIG_NET to fail.
      
      fs/compat_ioctl.c: In function `compat_sys_ioctl':
      fs/compat_ioctl.c:3571: warning: implicit declaration of function `siocdevprivate_ioctl'
      
      Cc: Christoph Hellwig <hch@lst.de>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Cc: Andi Kleen <ak@suse.de>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d9de2622