Merge branch 'gpiolib' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'gpiolib' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Hook up gpiolib support

diff --combined arch/ia64/Kconfig
index 137b277,578701e..64c7ab7
--- 1/arch/ia64/Kconfig
--- 2/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@@ -27,6 -27,7 +27,7 @@@ config IA6
        select GENERIC_PENDING_IRQ if SMP
        select IRQ_PER_CPU
        select GENERIC_IRQ_SHOW
+       select ARCH_WANT_OPTIONAL_GPIOLIB
        default y
        help
          The Itanium Processor Family is Intel's 64-bit successor to
@@@ -89,6 -90,9 +90,9 @@@ config GENERIC_TIME_VSYSCAL
  config HAVE_SETUP_PER_CPU_AREA
        def_bool y
  
+ config GENERIC_GPIO
+       def_bool y
+ 
  config DMI
        bool
        default y
@@@ -101,9 -105,6 +105,9 @@@ config GENERIC_IOMA
        bool
        default y
  
 +config ARCH_CLOCKSOURCE_DATA
 +      def_bool y
 +
  config SCHED_OMIT_FRAME_POINTER
        bool
        default y
@@@ -630,6 -631,27 +634,6 @@@ source "drivers/pci/hotplug/Kconfig
  
  source "drivers/pcmcia/Kconfig"
  
 -config DMAR
 -        bool "Support for DMA Remapping Devices (EXPERIMENTAL)"
 -        depends on IA64_GENERIC && ACPI && EXPERIMENTAL
 -      help
 -        DMA remapping (DMAR) devices support enables independent address
 -        translations for Direct Memory Access (DMA) from devices.
 -        These DMA remapping devices are reported via ACPI tables
 -        and include PCI device scope covered by these DMA
 -        remapping devices.
 -
 -config DMAR_DEFAULT_ON
 -      def_bool y
 -      prompt "Enable DMA Remapping Devices by default"
 -      depends on DMAR
 -      help
 -        Selecting this option will enable a DMAR device at boot time if
 -        one is found. If this option is not selected, DMAR support can
 -        be enabled by passing intel_iommu=on to the kernel. It is
 -        recommended you say N here while the DMAR code remains
 -        experimental.
 -
  endmenu
  
  endif
@@@ -663,3 -685,6 +667,3 @@@ source "lib/Kconfig
  
  config IOMMU_HELPER
        def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB)
 -
 -config IOMMU_API
 -      def_bool (DMAR)