Subject: [merged] cris-provide-inout_p.patch removed from -mm tree To: geert@xxxxxxxxxxxxxx,jesper.nilsson@xxxxxxxx,starvik@xxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Fri, 24 Jan 2014 10:58:17 -0800 The patch titled Subject: cris: provide {in,out}[wl]_p() has been removed from the -mm tree. Its filename was cris-provide-inout_p.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Subject: cris: provide {in,out}[wl]_p() drivers/staging/comedi/drivers/das6402.c: In function 'intr_handler': drivers/staging/comedi/drivers/das6402.c:164:3: error: implicit declaration of function 'outw_p' [-Werror=implicit-function-declaration] drivers/staging/speakup/speakup_dtlk.c: In function 'synth_probe': drivers/staging/speakup/speakup_dtlk.c:362:2: error: implicit declaration of function 'inw_p' [-Werror=implicit-function-declaration] Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Cc: Mikael Starvik <starvik@xxxxxxxx> Cc: Jesper Nilsson <jesper.nilsson@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/cris/include/asm/io.h | 4 ++++ 1 file changed, 4 insertions(+) diff -puN arch/cris/include/asm/io.h~cris-provide-inout_p arch/cris/include/asm/io.h --- a/arch/cris/include/asm/io.h~cris-provide-inout_p +++ a/arch/cris/include/asm/io.h @@ -169,7 +169,11 @@ static inline void outsl(unsigned int po } #define inb_p(port) inb(port) +#define inw_p(port) inw(port) +#define inl_p(port) inl(port) #define outb_p(val, port) outb((val), (port)) +#define outw_p(val, port) outw((val), (port)) +#define outl_p(val, port) outl((val), (port)) /* * Convert a physical pointer to a virtual kernel pointer for /dev/mem _ Patches currently in -mm which might be from geert@xxxxxxxxxxxxxx are origin.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html