diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-11-19 22:44:34 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-19 22:44:34 +0100 |
commit | 67ec55bcb3f86154587a23dc3f60a6cddff6ba30 (patch) | |
tree | cd50643e1fd3f8eeed6160edff1713e227246efd /arch/arm/mach-shmobile/setup-r8a73a4.c | |
parent | Merge tag 'nomadik-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | ARM: shmobile: koelsch: Enable DU device in DT (diff) | |
download | linux-67ec55bcb3f86154587a23dc3f60a6cddff6ba30.tar.xz linux-67ec55bcb3f86154587a23dc3f60a6cddff6ba30.zip |
Merge branch 'renesas/dt-du' into next/dt
This is a base for the DT updates, merged through the arm-soc
cleanup branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-shmobile/setup-r8a73a4.c')
-rw-r--r-- | arch/arm/mach-shmobile/setup-r8a73a4.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c index 179f28a2f794..c27682291cbf 100644 --- a/arch/arm/mach-shmobile/setup-r8a73a4.c +++ b/arch/arm/mach-shmobile/setup-r8a73a4.c @@ -12,10 +12,6 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include <linux/irq.h> #include <linux/kernel.h> |