summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-spear13xx
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-11-20 18:19:10 +0900
committerKukjin Kim <kgene.kim@samsung.com>2012-11-20 18:19:10 +0900
commit840ed42942cc1ebbda2ed55f4019673b537fc5de (patch)
tree415644488e3966837eeb5061d96d4ca7db862318 /arch/arm/mach-spear13xx
parent0dca30003bc752b2fc15906e562ef4e4925725fd (diff)
parent0a9d5ac307aefbb2c772537d3fe7f75046d563ac (diff)
downloadblackbird-op-linux-840ed42942cc1ebbda2ed55f4019673b537fc5de.tar.gz
blackbird-op-linux-840ed42942cc1ebbda2ed55f4019673b537fc5de.zip
Merge branch 'next/hdmi-samsung' into next/devel-samsung
Diffstat (limited to 'arch/arm/mach-spear13xx')
-rw-r--r--arch/arm/mach-spear13xx/include/mach/spear1310_misc_regs.h0
-rw-r--r--arch/arm/mach-spear13xx/include/mach/spear1340_misc_regs.h0
2 files changed, 0 insertions, 0 deletions
diff --git a/arch/arm/mach-spear13xx/include/mach/spear1310_misc_regs.h b/arch/arm/mach-spear13xx/include/mach/spear1310_misc_regs.h
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/arch/arm/mach-spear13xx/include/mach/spear1310_misc_regs.h
+++ /dev/null
diff --git a/arch/arm/mach-spear13xx/include/mach/spear1340_misc_regs.h b/arch/arm/mach-spear13xx/include/mach/spear1340_misc_regs.h
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/arch/arm/mach-spear13xx/include/mach/spear1340_misc_regs.h
+++ /dev/null
OpenPOWER on IntegriCloud