1. 15 Jul, 2008 35 commits
  2. 14 Jul, 2008 5 commits
    • David Woodhouse's avatar
      firmware: Correct dependency on CONFIG_EXTRA_FIRMWARE_DIR · 50515af2
      David Woodhouse authored
      
      
      When CONFIG_EXTRA_FIRMWARE_DIR gets changed, the filename in the .S file
      (which uses .incbin to include the binary) needs to change. When we
      renamed the BUILTIN_FIRMWARE_DIR option to EXTRA_FIRMWARE_DIR, we forgot
      to update the manual dependency in firmware/Makefile, so it was
      depending on a non-existent file in include/config/
      Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      50515af2
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6 · 5a861022
      Linus Torvalds authored
      * 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6: (64 commits)
        firmware: convert sb16_csp driver to use firmware loader exclusively
        dsp56k: use request_firmware
        edgeport-ti: use request_firmware()
        edgeport: use request_firmware()
        vicam: use request_firmware()
        dabusb: use request_firmware()
        cpia2: use request_firmware()
        ip2: use request_firmware()
        firmware: convert Ambassador ATM driver to request_firmware()
        whiteheat: use request_firmware()
        ti_usb_3410_5052: use request_firmware()
        emi62: use request_firmware()
        emi26: use request_firmware()
        keyspan_pda: use request_firmware()
        keyspan: use request_firmware()
        ttusb-budget: use request_firmware()
        kaweth: use request_firmware()
        smctr: use request_firmware()
        firmware: convert ymfpci driver to use firmware loader exclusively
        firmware: convert maestro3 driver to use firmware loader exclusively
        ...
      
      Fix up trivial conflicts with BKL removal in drivers/char/dsp56k.c and
      drivers/char/ip2/ip2main.c manually.
      5a861022
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 85082fd7
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (241 commits)
        [ARM] 5171/1: ep93xx: fix compilation of modules using clocks
        [ARM] 5133/2: at91sam9g20 defconfig file
        [ARM] 5130/4: Support for the at91sam9g20
        [ARM] 5160/1: IOP3XX: gpio/gpiolib support
        [ARM] at91: Fix NAND FLASH timings for at91sam9x evaluation kits.
        [ARM] 5084/1: zylonite: Register AC97 device
        [ARM] 5085/2: PXA: Move AC97 over to the new central device declaration model
        [ARM] 5120/1: pxa: correct platform driver names for PXA25x and PXA27x UDC drivers
        [ARM] 5147/1: pxaficp_ir: drop pxa_gpio_mode calls, as pin setting
        [ARM] 5145/1: PXA2xx: provide api to control IrDA pins state
        [ARM] 5144/1: pxaficp_ir: cleanup includes
        [ARM] pxa: remove pxa_set_cken()
        [ARM] pxa: allow clk aliases
        [ARM] Feroceon: don't disable BPU on boot
        [ARM] Orion: LED support for HP mv2120
        [ARM] Orion: add RD88F5181L-FXO support
        [ARM] Orion: add RD88F5181L-GE support
        [ARM] Orion: add Netgear WNR854T support
        [ARM] s3c2410_defconfig: update for current build
        [ARM] Acer n30: Minor style and indentation fixes.
        ...
      85082fd7
    • David Woodhouse's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git · 751851af
      David Woodhouse authored
      Conflicts:
      
      	sound/pci/Kconfig
      751851af
    • Russell King's avatar
      [ARM] Merge most of the PXA work for initial merge · 53ffe3b4
      Russell King authored
      This includes PXA work up to the SPI changes for the initial merge,
      since e172274c depends on the SPI
      tree being merged.
      
      Conflicts:
      
      	arch/arm/configs/em_x270_defconfig
      	arch/arm/configs/xm_x270_defconfig
      53ffe3b4