Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 022d5bcd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd 

* 'for-linus' of git://git.o-hand.com/linux-mfd:
  mfd: Fix asic3 compilation
  mfd: Fix Kconfig accroding to the new gpiolib symbols
parents 95237b80 6cac6e84

drivers/mfd/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ config MFD_SM501 


config MFD_SM501_GPIO

	bool "Export GPIO via GPIO layer"

	depends on MFD_SM501 && HAVE_GPIO_LIB

	depends on MFD_SM501 && GPIOLIB

	 ---help---

	 This option uses the gpio library layer to export the 64 GPIO

	 lines on the SM501. The platform data is used to supply the
@@ -29,7 +29,7 @@ config MFD_SM501_GPIO 


config MFD_ASIC3

	bool "Support for Compaq ASIC3"

	depends on GENERIC_HARDIRQS && HAVE_GPIO_LIB && ARM

	depends on GENERIC_HARDIRQS && GPIOLIB && ARM

	 ---help---

	  This driver supports the ASIC3 multifunction chip found on many

	  PDAs (mainly iPAQ and HTC based ones)

drivers/mfd/asic3.c

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,6 @@ static int __init asic3_irq_probe(struct platform_device *pdev) 
	struct asic3 *asic = platform_get_drvdata(pdev);

	unsigned long clksel = 0;

	unsigned int irq, irq_base;

	int map_size;

	int ret;



	ret = platform_get_irq(pdev, 0);
@@ -534,6 +533,7 @@ static int __init asic3_probe(struct platform_device *pdev) 
	struct asic3 *asic;

	struct resource *mem;

	unsigned long clksel;

	int map_size;

	int ret = 0;



	asic = kzalloc(sizeof(struct asic3), GFP_KERNEL);