linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>,
	Grant Likely <grant.likely@secretlab.ca>
Subject: linux-next: manual merge of the moduleh tree with the gpio tree
Date: Fri, 14 Oct 2011 17:02:02 +1100	[thread overview]
Message-ID: <20111014170202.1260e712d288e87c05ccd29d@canb.auug.org.au> (raw)

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

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/gpio/gpio-pch.c between commit 38eb18a6f92d ("gpio-pch: 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@canb.auug.org.au

diff --cc drivers/gpio/gpio-pch.c
index 46b5209,c9c4297..0000000
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@@ -17,17 -17,10 +17,18 @@@
  #include <linux/kernel.h>
  #include <linux/pci.h>
  #include <linux/gpio.h>
 +#include <linux/interrupt.h>
 +#include <linux/irq.h>
+ #include <linux/module.h>
  
 -#define PCH_GPIO_ALL_PINS	0xfff /* Mask for GPIO pins 0 to 11 */
 -#define GPIO_NUM_PINS	12	/* Specifies number of GPIO PINS GPIO0-GPIO11 */
 +#define PCH_EDGE_FALLING	0
 +#define PCH_EDGE_RISING		BIT(0)
 +#define PCH_LEVEL_L		BIT(1)
 +#define PCH_LEVEL_H		(BIT(0) | BIT(1))
 +#define PCH_EDGE_BOTH		BIT(2)
 +#define PCH_IM_MASK		(BIT(0) | BIT(1) | BIT(2))
 +
 +#define PCH_IRQ_BASE		24
  
  struct pch_regs {
  	u32	ien;

[-- 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]
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:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

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

  git send-email \
    --in-reply-to=20111014170202.1260e712d288e87c05ccd29d@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=grant.likely@secretlab.ca \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=paul.gortmaker@windriver.com \
    --cc=tomoya-linux@dsn.okisemi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* 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).