From: Paul Mundt Date: Tue, 28 Oct 2008 10:45:47 +0000 (+0900) Subject: sh: Revert "SH 7366 needs SCIF_ONLY" X-Git-Tag: v2.6.28-rc3~23^2~12 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5ff0594e2f6fb3242a1a2a4794286244e95afab1;p=linux-2.6-omap-h63xx.git sh: Revert "SH 7366 needs SCIF_ONLY" This reverts commit 5ca8c4852fcbbc8a8497c4ee8b2a0a7466f3524c. With the killing off of SCIF_ONLY and its spawn in sh-sci, we no longer require this change, so just revert it. Signed-off-by: Paul Mundt --- diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h index 36ce9de4b2c..257b2235d12 100644 --- a/drivers/serial/sh-sci.h +++ b/drivers/serial/sh-sci.h @@ -79,7 +79,6 @@ # define SCSPTR0 SCPDR0 # define SCIF_ORER 0x0001 /* overrun error bit */ # define SCSCR_INIT(port) 0x0038 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ -# define SCIF_ONLY #elif defined(CONFIG_CPU_SUBTYPE_SH7723) # define SCSPTR0 0xa4050160 # define SCSPTR1 0xa405013e