public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: linux-arm-kernel@lists.arm.linux.org.uk
Cc: linux-omap@vger.kernel.org
Subject: Re: [PATCH 0/3] Omap header cleanup for upcoming 2.6.32 merge window
Date: Mon, 24 Aug 2009 16:05:13 +0300	[thread overview]
Message-ID: <20090824130512.GA5165@atomide.com> (raw)
In-Reply-To: <20090806100614.2569.8531.stgit@localhost>

* Tony Lindgren <tony@atomide.com> [090806 13:09]:
> Hi all,
> 
> Here are few patches for the upcoming merge window to remove unnecessary
> ifdeffery in the header files.
> 
> We should get these merged early to avoid merge conflicts with other
> patchsets.

I've added this series into omap for-next branch.
 
> Regards,
> 
> Tony
> 
> ---
> 
> Tony Lindgren (3):
>       OMAP: Remove ifdefs for io.h
>       OMAP: Rename OMAP_MPUIO_BASE to OMAP1_MPUIO_BASE
>       OMAP: Remove OMAP_IO_ADDRESS, use OMAP1_IO_ADDRESS and OMAP2_IO_ADDRESS instead
> 
> 
>  arch/arm/mach-omap1/devices.c                 |    2 -
>  arch/arm/mach-omap1/io.c                      |    6 +-
>  arch/arm/mach-omap1/pm.h                      |    4 +
>  arch/arm/mach-omap1/serial.c                  |    6 +-
>  arch/arm/mach-omap1/sram.S                    |   12 ++-
>  arch/arm/mach-omap1/time.c                    |    4 +
>  arch/arm/mach-omap2/board-4430sdp.c           |    4 +
>  arch/arm/mach-omap2/cm.h                      |    6 +-
>  arch/arm/mach-omap2/omap-smp.c                |    2 -
>  arch/arm/mach-omap2/pm-debug.c                |    2 -
>  arch/arm/mach-omap2/prm.h                     |    6 +-
>  arch/arm/mach-omap2/sdrc.h                    |    6 +-
>  arch/arm/mach-omap2/serial.c                  |    6 +-
>  arch/arm/mach-omap2/sram242x.S                |    4 +
>  arch/arm/mach-omap2/sram243x.S                |    4 +
>  arch/arm/mach-omap2/timer-gp.c                |    2 -
>  arch/arm/plat-omap/dma.c                      |    8 +-
>  arch/arm/plat-omap/dmtimer.c                  |    5 +
>  arch/arm/plat-omap/gpio.c                     |   88 +++++++++++------------
>  arch/arm/plat-omap/include/mach/control.h     |   12 ++-
>  arch/arm/plat-omap/include/mach/entry-macro.S |    8 +-
>  arch/arm/plat-omap/include/mach/gpio.h        |    2 -
>  arch/arm/plat-omap/include/mach/io.h          |   97 ++++++++++++-------------
>  arch/arm/plat-omap/include/mach/mtd-xip.h     |    2 -
>  arch/arm/plat-omap/include/mach/omap44xx.h    |    8 +-
>  arch/arm/plat-omap/include/mach/sdrc.h        |    6 +-
>  arch/arm/plat-omap/io.c                       |   62 +++++++++++++++-
>  arch/arm/plat-omap/sram.c                     |   20 +++--
>  drivers/input/keyboard/omap-keypad.c          |   22 +++---
>  drivers/mtd/nand/ams-delta.c                  |    8 +-
>  drivers/video/omap/dispc.c                    |    6 +-
>  31 files changed, 245 insertions(+), 185 deletions(-)
> 
> -- 
> Signature
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

      parent reply	other threads:[~2009-08-24 13:05 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-06 10:08 [PATCH 0/3] Omap header cleanup for upcoming 2.6.32 merge window Tony Lindgren
2009-08-06 10:10 ` [PATCH 1/3] OMAP: Remove OMAP_IO_ADDRESS, use OMAP1_IO_ADDRESS and OMAP2_IO_ADDRESS instead Tony Lindgren
2009-08-06 10:40   ` Felipe Balbi
2009-08-06 10:50     ` Tony Lindgren
2009-08-06 10:11 ` [PATCH 2/3] OMAP: Rename OMAP_MPUIO_BASE to OMAP1_MPUIO_BASE Tony Lindgren
2009-08-06 10:13 ` [PATCH 3/3] OMAP: Remove ifdefs for io.h Tony Lindgren
2009-08-06 11:01 ` [PATCH 0/3] Omap header cleanup for upcoming 2.6.32 merge window Russell King - ARM Linux
2009-08-06 11:11   ` Tony Lindgren
2009-08-11  9:28     ` git pull request for omap " Tony Lindgren
2009-08-24 13:05 ` Tony Lindgren [this message]

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=20090824130512.GA5165@atomide.com \
    --to=tony@atomide.com \
    --cc=linux-arm-kernel@lists.arm.linux.org.uk \
    --cc=linux-omap@vger.kernel.org \
    /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