archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Paul Gortmaker <>
	Tomoya MORINAGA <>,
	Grant Likely <>
Subject: linux-next: manual merge of the moduleh tree with the gpio tree
Date: Fri, 14 Oct 2011 17:02:15 +1100	[thread overview]
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 1146 bytes --]

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
Stephen Rothwell          

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 #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2011-10-14  6:02 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-14  6:02 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-10-14  6:02 linux-next: manual merge of the moduleh tree with the gpio tree Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).