Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6

Browse source

* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6:
  gpio/samsung: make Kconfig options def_bool
  gpio/exynos4: Fix incorrect mapping of gpio pull-up macro to register setting
  GPIO: OMAP: add locking around calls to _set_gpio_triggering
  GPIO: OMAP: fix setting IRQWAKEN bits for OMAP4
  GPIO: OMAP: fix section mismatch warnings
  gpio: Fix gpio-exynos4 build fails in mainline

...

This commit is contained in:

Linus Torvalds 2011-06-08 08:22:29 -07:00

parent 46671b0355 c226feb013

commit 5b28f6a25e

3 changed files with 45 additions and 35 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

28

drivers/gpio/Kconfig

View file

29

drivers/gpio/gpio-exynos4.c

View file

23

drivers/gpio/gpio-omap.c

View file