1. 11 May, 2007 35 commits
  2. 10 May, 2007 5 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
    • Frederik Deweerdt's avatar
      Fix ixp4xx compile error · 643bd272
      Frederik Deweerdt authored
      drivers/input/misc/ixp4xx-beeper.c: In function 'ixp4xx_spkr_event':
      drivers/input/misc/ixp4xx-beeper.c:54: error: 'input_dev' undeclared (first use in this function)
      drivers/input/misc/ixp4xx-beeper.c:54: error: (Each undeclared identifier is reported only once
      drivers/input/misc/ixp4xx-beeper.c:54: error: for each function it appears in.)
      Signed-off-by: default avatarFrederik Deweerdt <frederik.deweerdt@gmail.com>
      Acked-by: default avatarDmitry Torokhov <dtor@mail.ru>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      643bd272
    • Linus Torvalds's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 62933d36
      Linus Torvalds authored
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (24 commits)
        [POWERPC] Fix compile error with kexec and CONFIG_SMP=n
        [POWERPC] Split initrd logic out of early_init_dt_scan_chosen() to fix warning
        [POWERPC] Fix warning in hpte_decode(), and generalize it
        [POWERPC] Minor pSeries IOMMU debug cleanup
        [POWERPC] PS3: Fix sys manager build error
        [POWERPC] Assorted janitorial EEH cleanups
        [POWERPC] We don't define CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID
        [POWERPC] pmu_sys_suspended is only defined for PPC32
        [POWERPC] Fix incorrect calculation of I/O window addresses
        [POWERPC] celleb: Update celleb_defconfig
        [POWERPC] celleb: Fix parsing of machine type hack command line option
        [POWERPC] celleb: Fix PCI config space accesses to subordinate buses
        [POWERPC] celleb: Fix support for multiple PCI domains
        [POWERPC] Wire up sys_utimensat
        [POWERPC] CPM_UART: Removed __init from cpm_uart_init_portdesc to fix warning
        [POWERPC] User rheap from arch/powerpc/lib
        [POWERPC] 83xx: Fix the PCI ranges in the MPC834x_MDS device tree.
        [POWERPC] 83xx: Fix the PCI ranges in the MPC832x_MDS device tree.
        [POWERPC] CPM_UART: cpm_uart_set_termios should take ktermios, not termios
        [POWERPC] Change rheap functions to use ulongs instead of pointers
        ...
      62933d36
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 0ab59809
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Use alloc_pci_dev() in PCI bus probes.
        [SPARC64]: Bump PROMINTR_MAX to 32.
        [SPARC64]: Fix recursion in PROM tree building.
        [SERIAL] sunzilog: Interrupt enable before ISR handler installed
        [SPARC64] PCI: Consolidate PCI access code into pci_common.c
      0ab59809