• Linus Torvalds's avatar
    Merge branch 'viafb-next' of git://git.lwn.net/linux-2.6 · 7c6d87ac
    Linus Torvalds authored
    * 'viafb-next' of git://git.lwn.net/linux-2.6: (35 commits)
      viafb: move some include files to include/linux
      viafb: Eliminate some global.h references
      viafb: get rid of i2c debug cruft
      viafb: fold via_io.h into via-core.h
      viafb: Fix initialization error paths
      viafb: Do not remove gpiochip under spinlock
      viafb: make procfs entries optional
      viafb: fix proc entry removal
      viafb: improve misc register handling
      viafb: replace inb/outb
      viafb: move some modesetting functions to a seperate file
      viafb: unify modesetting functions
      viafb: Reserve framebuffer memory for the upcoming camera driver
      viafb: Add a simple VX855 DMA engine driver
      viafb: Add a simple interrupt management infrastructure
      via: Rationalize vt1636 detection
      viafb: Introduce viafb_find_i2c_adapter()
      via: Do not attempt I/O on inactive I2C adapters
      viafb: Turn GPIO and i2c into proper platform devices
      viafb: Convert GPIO and i2c to the new indexed port ops
      ...
    7c6d87ac
viafbdev.c 60.1 KB