summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorEric Miao <eric.y.miao@gmail.com>2010-03-16 17:03:20 +0800
committerEric Miao <eric.y.miao@gmail.com>2010-05-11 17:24:58 +0200
commit83f2889643d8efbc7fe925afbaa114e775699d7c (patch)
tree05567c10d9dc4428d0c9fa7c424173f51ca40b10 /sound/soc
parentc9840daa70fbb8f6031fcd1f254a3da49a41ea7b (diff)
downloadlinux-3.10-83f2889643d8efbc7fe925afbaa114e775699d7c.tar.gz
linux-3.10-83f2889643d8efbc7fe925afbaa114e775699d7c.tar.bz2
linux-3.10-83f2889643d8efbc7fe925afbaa114e775699d7c.zip
[ARM] pxa: merge regs-ssp.h into ssp.h
No need to separate them as they should be together from the begining. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/pxa/pxa-ssp.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 544fd9566f4..2e27962220a 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -32,7 +32,6 @@
#include <mach/hardware.h>
#include <mach/dma.h>
-#include <mach/regs-ssp.h>
#include <mach/audio.h>
#include <mach/ssp.h>