linux-next: manual merge of the moduleh tree with the gpio tree

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/gpio/gpio-ml-ioh.c between commit 54be566317b6 ("gpio-ml-ioh:
Support interrupt function") from the gpio tree and commit d331aa9b3a0b
("drivers/gpio: Fix drivers who are implicit users of module.h") from the
moduleh tree.

Just context changes.  I fxied it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/gpio/gpio-ml-ioh.c
index 274fd4d,16c7b5b..0000000
--- a/drivers/gpio/gpio-ml-ioh.c
+++ b/drivers/gpio/gpio-ml-ioh.c
@@@ -18,18 -18,8 +18,19 @@@
  #include <linux/slab.h>
  #include <linux/pci.h>
  #include <linux/gpio.h>
 +#include <linux/interrupt.h>
 +#include <linux/irq.h>
+ #include <linux/module.h>
  
 +#define IOH_EDGE_FALLING	0
 +#define IOH_EDGE_RISING		BIT(0)
 +#define IOH_LEVEL_L		BIT(1)
 +#define IOH_LEVEL_H		(BIT(0) | BIT(1))
 +#define IOH_EDGE_BOTH		BIT(2)
 +#define IOH_IM_MASK		(BIT(0) | BIT(1) | BIT(2))
 +
 +#define IOH_IRQ_BASE		0
 +
  #define PCI_VENDOR_ID_ROHM             0x10DB
  
  struct ioh_reg_comn {

Attachment: pgp00000.pgp
Description: PGP signature