1. 08 6月, 2007 5 次提交
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · c52ecdab
      Linus Torvalds 提交于
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] pxa: fix pxa27x keyboard driver
        [ARM] Fix 4417/1: Serial: Fix AMBA drivers locking
        [ARM] 4421/1: AT91: Value of _KEY fields.
        [ARM] Solve buggy smp_processor_id() usage
        [ARM] 4422/1: Fix default value handling in gpio_direction_output (PXA)
        [ARM] 4419/1: AT91: SAM9 USB clocks check for suspending
        [ARM] 4418/1: AT91: Number of programmable clocks differs
        [ARM] 4392/2: Do not corrupt the SP register in compressed/head.S
      c52ecdab
    • L
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · dc315011
      Linus Torvalds 提交于
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
        [MIPS] Fix warning by moving do_default_vi into CONFIG_CPU_MIPSR2_SRS
        [MIPS] Fix some minor typoes in arch/mips/Kconfig.
        [MIPS] Remove prototype for deleted function qemu_handle_int
        [MIPS] Fix some system calls with long long arguments
        [MIPS] Make dma_map_sg handle sg elements which are longer than one page
        [MIPS] Drop __ARCH_WANT_SYS_FADVISE64
        [MIPS] Fix VGA corruption on RM300C
        [MIPS] RM300: Fix MMIO problems by marking the PCI INT ACK region busy
        [MIPS] EMMA2RH: remove dead KGDB code
        [MIPS] Remove duplicate fpu enable hazard code.
        [MIPS] Atlas, Malta, SEAD: Remove scroll from interrupt handler.
      dc315011
    • P
      frv: build fix · 2c750edd
      Peter Zijlstra 提交于
      In file included from /usr/src/linux-2.6-2/net/ipv4/ip_input.c:118:
      
        include2/asm/system.h:245: error: parse error before "__cmpxchg_32"
        include2/asm/system.h:245: error: parse error before '*' token
        include2/asm/system.h:245: warning: type defaults to `int' in declaration of `__cmpxchg_32'
        include2/asm/system.h:245: warning: function declaration isn't a prototype
        include2/asm/system.h:245: warning: data definition has no type or storage class
      Signed-off-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      Acked-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      2c750edd
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 · 8a2e2103
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
        sh: Fix se73180 platform device registration.
        sh: ioremap() through PMB needs asm/mmu.h.
        sh: voyagergx: Fix build warnings.
        sh: Fix SH4-202 clock fwk set_rate() mismatch.
        sh: microdev: Fix compile warnings.
        sh: Fix in_nmi symbol build error.
      8a2e2103
    • L
      Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 7244d545
      Linus Torvalds 提交于
      * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [VIDEO] sunxvr500fb: Fix pseudo_palette array size
        [VIDEO] sunxvr2500fb: Fix pseudo_palette array size
        [VIDEO] ffb: The pseudo_palette is only 16 elements long
        [VIDEO]: Fix section mismatch warning in promcon.
        [ATA]: Back out bogus (SPARC64 && !PCI) Kconfig depends.
        [SPARC64]: Fill in gaps in non-PCI dma_*() NOP implementation.
        [SPARC64]: Fix {mc,smt}_capable().
        [SPARC64]: Make core and sibling groups equal on UltraSPARC-IV.
        [SPARC64]: Proper multi-core scheduling support.
        [SPARC64]: Provide mmu statistics via sysfs.
        [SPARC64]: Fix service channel hypervisor function names.
        [SPARC64]: Export basic cpu properties via sysfs.
        [SPARC64]: Move topology init code into new file, sysfs.c
      7244d545
  2. 07 6月, 2007 29 次提交
  3. 06 6月, 2007 5 次提交
  4. 05 6月, 2007 1 次提交
    • S
      [VIDEO]: Fix section mismatch warning in promcon. · 353076fe
      Sam Ravnborg 提交于
      Fix the following warnings in promcon:
      WARNING: o-sparc64/drivers/video/console/built-in.o(.text+0x480): Section mismatch: reference to .init.data:promfont_unitable (between 'promcon_init_unimap' and 'promcon_init')
      WARNING: o-sparc64/drivers/video/console/built-in.o(.text+0x488): Section mismatch: reference to .init.data:promfont_unitable (between 'promcon_init_unimap' and 'promcon_init')
      WARNING: o-sparc64/drivers/video/console/built-in.o(.text+0x48c): Section mismatch: reference to .init.data:promfont_unicount (between 'promcon_init_unimap' and 'promcon_init')
      WARNING: o-sparc64/drivers/video/console/built-in.o(.text+0x490): Section mismatch: reference to .init.data:promfont_unicount (between 'promcon_init_unimap' and 'promcon_init')
      
      The warnings happens because the function: promcon_init_unimap()
      references promfont_unitable and promfont_unicount which are marked
      __initdata by the conmakehash command in the drivers/video/console/Makefile
      
      Fix the warning by removing the __initdata marker on the two variables.
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      353076fe