Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.26-rc3
Commits on May 18, 2008
  1. Linux 2.6.26-rc3

    authored
  2. Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare…

    authored
    …-2.6
    
    * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
      i2c/max6875: Really prevent 24RF08 corruption
      i2c-amd756: Fix functionality flags
      i2c: Kill the old driver matching scheme
      i2c: Convert remaining new-style drivers to use module aliasing
      i2c: Switch pasemi to the new device/driver matching scheme
      i2c: Clean up Blackfin BF527 I2C device declarations
      i2c-nforce2: Disable the second SMBus channel on the DFI Lanparty NF4 Expert
      i2c: New co-maintainer
  3. Geert Uytterhoeven

    m68k: Add multi_defconfig

    geertu authored committed
    Add multi_defconfig, to build a kernel for all supported m68k platforms,
    excluding Sun 3 (Sun 3 kernels are incompatible with all other m68k platforms)
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. Geert Uytterhoeven

    m68k: Update defconfigs

    geertu authored committed
    Update the m68k defconfigs
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. Geert Uytterhoeven

    m68k: Correctly handle multi-ISA at runtime

    geertu authored committed
    m68k: Correctly handle multi-ISA at runtime in multi-platform kernels
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. Geert Uytterhoeven

    m68k: Prefix ISA type with ISA_TYPE_

    geertu authored committed
    The *_ISA type defines are quite generic and cause namespace conflicts
    (e.g. with `AMIGAHW_DECLARE(GG2_ISA)' in <asm/amigahw.h>) for some kernel
    configurations. Use ISA_TYPE_* to avoid such conflicts.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. Geert Uytterhoeven

    m68k: export m68k_mmutype

    geertu authored committed
    UIO needs m68k_mmutype:
    
    ERROR: "m68k_mmutype" [drivers/uio/uio.ko] undefined!
    
    (noticed by Christian T. Steigies)
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. Geert Uytterhoeven

    m68k: Q40/Q60 floppy support is broken

    geertu authored committed
    Mark Q40/Q60 floppy support broken:
    
        arch/m68k/q40/q40ints.c: In function 'q40_irq_handler':
        arch/m68k/q40/q40ints.c:214: error: implicit declaration of function 'floppy_hardint'
    
    Including <asm/floppy.h> doesn't help, as it causes a lot of additional error
    messages (cfr. Sun 3x).
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. Geert Uytterhoeven

    m68k: Return -ENODEV if no device is found

    geertu authored committed
    According to the tests in do_initcalls(), the proper error code in case no
    device is found is -ENODEV, not -ENXIO or -EIO.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. Geert Uytterhoeven

    m68k: Some input drivers do not check the platform

    geertu authored committed
    Some input drivers do not check whether they're actually running on the
    correct platform, causing multi-platform kernels to crash if they are not.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. Geert Uytterhoeven

    m68k: Some network drivers do not check the platform

    geertu authored committed
    Some network drivers do not check whether they're actually running on the
    correct platform, causing multi-platform kernels to crash if they are not.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. Geert Uytterhoeven

    m68k: dnfb doesnt check for Apollo

    geertu authored committed
    The Apollo frame buffer device driver (dnfb) doesn't check whether it's
    actually running on Apollo hardware, causing a crash if it isn't.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. Geert Uytterhoeven

    m68k: macide doesnt check for Mac

    geertu authored committed
    The Macintosh IDE driver (macide) doesn't check whether it's actually running
    on Mac hardware, causing a crash if it isn't.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  14. Geert Uytterhoeven

    m68k: Correct jump if not running on HP300

    geertu authored committed
    When running a HP300-enabled kernel on non-HP300 hardware, a test in the early
    startup code jumps to the wrong label, causing a double bus fault.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. Geert Uytterhoeven

    m68k: Make gcc aware that BUG() does not return

    geertu authored committed
    Use `__builtin_trap()' instead of `asm volatile("illegal")' in the m68k BUG()
    macros (as suggested by Andrew Pinski), to kill warnings in code that assumes
    BUG() does not return.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. Geert Uytterhoeven

    m68k vme_scc: avoid global namespace pollution

    geertu authored committed
    m68k vme_scc:
      - make scc_ports[] static
      - kill unused global scc_initialized
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  17. Geert Uytterhoeven

    m68k: Kill CONFIG_WHIPPET_SERIAL

    geertu authored committed
    The Hisoft Whippet PCMCIA serial driver has been removed a long time ago, but
    it's Kconfig symbol still existed.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  18. Geert Uytterhoeven

    m68k: FB_HP300 depends on DIO and doesnt need FB_CFB_FILLRECT

    geertu authored committed
    Correct FB_HP300 dependencies:
      - FB_HP300 doesn't depend only on HP300, but also on DIO (which depends on
        HP300)
      - FB_HP300 does not need FB_CFB_FILLRECT
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  19. Geert Uytterhoeven

    m68k: Kill CONFIG_FB_DAFB

    geertu authored committed
    CONFIG_FB_DAFB is a leftover from pre-Kconfig
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  20. Geert Uytterhoeven

    m68k: Convert access_ok() to an inline function

    geertu authored committed
    Convert access_ok() from a macro to an inline function, so the compiler no
    longer complains about unused variables:
    
        fs/read_write.c: In function 'rw_copy_check_uvector':
        fs/read_write.c:556: warning: unused variable 'buf'
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  21. i2c/max6875: Really prevent 24RF08 corruption

    Jean Delvare authored Jean Delvare committed
    i2c-core takes care of the possible corruption of 24RF08 chips for
    quite some times, so device devices no longer need to do it. And they
    really should not, as applying the prevention twice voids it.
    
    I thought that I had fixed all drivers long ago but apparently I had
    missed that one.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Ben Gardner <bgardner@wabtec.com>
  22. i2c-amd756: Fix functionality flags

    Jean Delvare authored Jean Delvare committed
    The i2c-amd756 driver pretends to support SMBus process call
    transactions but actually does not. Fix it.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  23. i2c: Kill the old driver matching scheme

    Jean Delvare authored Jean Delvare committed
    Remove the old driver_name/type scheme for i2c driver matching. Only the
    standard aliasing model will be used from now on.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  24. i2c: Convert remaining new-style drivers to use module aliasing

    Jean Delvare authored Jean Delvare committed
    Update all the remaining new-style i2c drivers to use standard module
    aliasing instead of the old driver_name/type driver matching scheme.
    
    Note that the tuner driver is a bit quirky at the moment, as it
    overwrites i2c_client.name with arbitrary strings. We write "tuner"
    back on remove, to make sure that driver cycling will work properly,
    but there may still be troublesome corner cases.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  25. i2c: Switch pasemi to the new device/driver matching scheme

    Jean Delvare authored Jean Delvare committed
    The old device/driver matching scheme is going away so stop using it.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Olof Johansson <olof@lixom.net>
  26. i2c: Clean up Blackfin BF527 I2C device declarations

    Jean Delvare authored Jean Delvare committed
    I2C_BOARD_INFO() now sets the type field so no need to set it
    separatetly.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Bryan Wu <cooloney@kernel.org>
  27. i2c-nforce2: Disable the second SMBus channel on the DFI Lanparty NF4…

    Jean Delvare authored Jean Delvare committed
    … Expert
    
    There is a strange chip at 0x2e on the second SMBus channel of the
    DFI Lanparty NF4 Expert motherboard. Accessing the chip reboots the
    system. As there's nothing interesting on this SMBus channel, the
    easiest and safest thing to do is to disable it on that board.
    
    This is a better fix to bug #5889 than the it87 driver update that was
    done originally:
    http://bugzilla.kernel.org/show_bug.cgi?id=5889
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
  28. i2c: New co-maintainer

    Jean Delvare authored Jean Delvare committed
    Ben Dooks agreed to become my co-maintainer for the i2c subsystem. In
    particular, Ben will help with drivers for embedded systems, of which
    my experience is inexistent. Thanks Ben and welcome on board!
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Acked-by: Ben Dooks <ben-linux@fluff.org>
Commits on May 17, 2008
  1. Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

    authored
    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
      [ARM] pxa: spitz wants PXA27x UDC definitions
      [ARM] pxa: fix pxafb build when cpufreq is enabled
      [ARM] fix parenthesis in include/asm-arm/arch-omap/control.h
      [ARM] colibri: fix support for DM9000 ethernet device
      [ARM] arm/kernel/arthur.c: add MODULE_LICENSE
      [ARM] 5037/1: Orion: fix DNS323/Kurobox Pro PCI initialisation
      [ARM] 5034/1: fix arm{925,926,940,946} dma_flush_range() in WT mode
      [ARM] export copy_page
      [ARM] 5026/1: locomo: add .settype for gpio and several small fixes
      ARM: OMAP: Fixed comments on global PRM register usage
      ARM: OMAP: Add PARENT_CONTROLS_CLOCK flag to dpll5_m2_ck
      ARM: OMAP: PRCM fixes to ssi clock handling
      ARM: OMAP: Add fuctional clock enabler for iva2
      ARM: OMAP: Fix 34xx to use correct shift values for gpio2-6 fclks
      ARM: OMAP: Keymap fix for palmte and palmz71
      ARM: OMAP: Fix Unbalanced enable for IRQ in omap mailbox
      ARM: OMAP: DMA: Fix incorrect channel linking
      ARM: OMAP: Warn on disabling clocks with no users
      ARM: OMAP: Add calls to omap2_set_globals_*()
      ARM: OMAP: Update MMC header to fix compile
  2. Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kerne…

    Russell King authored Russell King committed
    …l/git/tmlind/linux-omap-2.6
  3. Merge branch 'sa1100'

    Russell King authored Russell King committed
  4. [ARM] pxa: spitz wants PXA27x UDC definitions

    Russell King authored Russell King committed
    ... so include the header file.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  5. [ARM] pxa: fix pxafb build when cpufreq is enabled

    Russell King authored Russell King committed
    If cpufreq is enabled, pxafb wants to call the removed
    get_clk_frequency_khz() function for a debug printk.  Remove
    this reference.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  6. [ARM] fix parenthesis in include/asm-arm/arch-omap/control.h

    Mariusz Kozlowski authored Russell King committed
    Parenthesis fix in include/asm-arm/arch-omap/control.h
    
    Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
    Cc: Paul Walmsley <paul@pwsan.com>
    Cc: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  7. Michael Abbott

    [ARM] colibri: fix support for DM9000 ethernet device

    Araneidae authored Russell King committed
    Two changes are necessary to enable proper operation of the DM9000 device with
    the Colibri PXA 270 board: firstly, the IRQ type needs to be configured for
    rising edge interrupts, and secondly this configuration needs to be
    communicated through to the DM9000.
    
    [akpm@linux-foundation.org: remove set_irq_type() call as per ben-linux request]
    Signed-off-by: Michael Abbott <michael.abbott@diamond.ac.uk>
    Cc: Daniel Mack <daniel@caiaq.org>
    Cc: Jeff Garzik <jeff@garzik.org>
    Cc: Ben Dooks <ben-linux@fluff.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Something went wrong with that request. Please try again.