Skip to content

Commit ae0645a

Browse files
torvaldstorvalds
committed
Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd
* 'for-linus' of git://git.o-hand.com/linux-mfd: mfd: let asic3 use mem resource instead of bus_shift mfd: remove DS1WM register definitions from asic3.h mfd: add ASIC3_CONFIG_GPIO templates mfd: fix the asic3 irq demux code mfd: asic3 should depend on gpiolib mfd: fix asic3 config array initialisation mfd: move asic3 probe functions into __init section mfd: Use uppercase only for asic3 macros and defines mfd: use dev_* macros for asic3 debugging mfd: New asic3 gpio configuration code mfd: asic3 children platform data removal mfd: asic3 gpiolib support
2 parents f894d18 + 99cdb0c commit ae0645a

File tree

3 files changed

+319
-256
lines changed

3 files changed

+319
-256
lines changed

‎drivers/mfd/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ config MFD_SM501
1717

1818
config MFD_ASIC3
1919
bool "Support for Compaq ASIC3"
20-
depends on GENERIC_HARDIRQS && ARM
20+
depends on GENERIC_HARDIRQS && HAVE_GPIO_LIB && ARM
2121
---help---
2222
This driver supports the ASIC3 multifunction chip found on many
2323
PDAs (mainly iPAQ and HTC based ones)

0 commit comments

Comments
 (0)