From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Takashi Iwai <tiwai@suse•de>
Cc: linux-next@vger•kernel.org, Ben Dooks <ben@simtec•co.uk>,
Mark Brown <broonie@opensource•wolfsonmicro.com>,
Alexander Schulz <alex@shark-linux•de>,
Russell King <rmk@arm•linux.org.uk>
Subject: linux-next: manual merge of the sound tree with the arm tree
Date: Tue, 10 Mar 2009 14:45:28 +1100 [thread overview]
Message-ID: <20090310144528.0fa208dd.sfr@canb.auug.org.au> (raw)
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
arch/arm/mach-shark/include/mach/io.h between commit
eab184c2362567f2b2e951b7bd0e0d353a7e5091 ("[ARM] 5363/1: Shark cleanup
and new defconfig") from the arm tree and commit
8150bc886be5ce3cc301a2baca1fcf2cf7bd7f39 ("S3C24XX: Move and update IIS
headers") from the sound tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/arm/mach-shark/include/mach/io.h
index 9ccbcec,8ca7d7f..0000000
--- a/arch/arm/mach-shark/include/mach/io.h
+++ b/arch/arm/mach-shark/include/mach/io.h
@@@ -11,10 -11,10 +11,10 @@@
#ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H
-#define PCIO_BASE 0xe0000000
-#define IO_SPACE_LIMIT 0xffffffff
+#define IO_SPACE_LIMIT 0xffffffff
- #define __io(a) ((void __iomem *)(0xe0000000 + (a)))
-#define __io(a) __typesafe_io(PCIO_BASE + (a))
-#define __mem_pci(addr) (addr)
++#define __io(a) __typesafe_io(0xe0000000 + (a))
+
+#define __mem_pci(addr) (addr)
#endif
next reply other threads:[~2009-03-10 3:45 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-10 3:45 Stephen Rothwell [this message]
2009-03-10 20:04 ` linux-next: manual merge of the sound tree with the arm tree Mark Brown
2009-03-11 0:41 ` Stephen Rothwell
2009-03-11 6:58 ` Takashi Iwai
2009-03-11 8:52 ` Russell King
2009-03-11 9:18 ` Takashi Iwai
2009-03-11 9:41 ` Russell King
2009-03-11 10:02 ` Takashi Iwai
2009-03-11 10:40 ` Russell King
2009-03-11 11:24 ` Mark Brown
2009-03-11 13:28 ` Takashi Iwai
2009-03-11 22:32 ` Mark Brown
2009-03-12 2:48 ` Stephen Rothwell
2009-03-11 9:49 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2010-07-19 1:00 Stephen Rothwell
2010-07-20 9:03 ` Mark Brown
2010-07-20 20:54 ` Ryan Mallon
2010-07-22 1:28 Stephen Rothwell
2010-07-22 6:18 ` Takashi Iwai
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=20090310144528.0fa208dd.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alex@shark-linux$(echo .)de \
--cc=ben@simtec$(echo .)co.uk \
--cc=broonie@opensource$(echo .)wolfsonmicro.com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=tiwai@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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