• Linus Torvalds's avatar
    Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 79c9601c
    Linus Torvalds authored
    * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (272 commits)
      Fix soc_common PCMCIA configuration
      ARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_request
      ARM: 5826/1: SA1100: h3100/h3600: always build htc-egpio driver
      ARM: 5825/1: SA1100: h3600: update defconfig
      ARM: 5824/1: SA1100: reuse h3600 PCMCIA driver on h3100
      ARM: 5823/1: SA1100: h3100/h3600: add support for gpio-keys
      ARM: 5822/1: SA1100: h3100/h3600: clean up #includes
      ARM: 5821/1: SA1100: h3100/h3600: revise copyright boilerplates
      ARM: 5820/1: SA1100: h3100/h3600: split h3600.c
      ARM: 5819/1: SA1100: h3100/h3600: merge h3600.h and h3600_gpio.h into h3xxx.h
      ARM: 5818/1: SA1100: h3100/h3600: drop old GPIO definitions
      ARM: 5817/1: SA1100: h3100/h3600: configure all unused gpios as inputs
      ARM: 5816/1: SA1100: h3600: remove IRQ_GPIO_* definitions
      ARM: 5815/1: SA1100: h3100/h3600: remove now unused assign_h3600_egpio handlers
      ARM: 5814/1: SA1100: h3100/h3600: convert all users of assign_h3600_egpio to gpiolib
      ARM: 5813/1: SA1100: h3100/h3600: add htc-egpio driver
      ARM: 5812/1: SA1100: h3100/h3600: separate machine-specific LCD helpers
      ARM: 5811/2: pcmcia: convert sa1100_h3600 driver to gpiolib
      ARM: 5799/1: SA1100: h3600: stop setting direction for LCD pins
      ARM: 5798/1: SA1100: h3600: remove unused cruft from h3600.h
      ...
    79c9601c
map.h 2.82 KB