diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-04 05:41:28 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:40:08 -0400 |
commit | be509729356b7433f73df2b9a966674a437fbbc1 (patch) | |
tree | 5a3e90513c106f9dcf08405e4ebd3599fd14413c /sound | |
parent | 0f8469a54f7bd65f2c740a5480c56260dc8a7ae0 (diff) |
[ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead
Remove includes of asm/hardware.h in addition to asm/arch/hardware.h.
Then, since asm/hardware.h only exists to include asm/arch/hardware.h,
update everything to directly include asm/arch/hardware.h and remove
asm/hardware.h.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/arm/pxa2xx-ac97.c | 2 | ||||
-rw-r--r-- | sound/arm/pxa2xx-pcm.c | 2 | ||||
-rw-r--r-- | sound/arm/sa11xx-uda1341.c | 2 | ||||
-rw-r--r-- | sound/oss/vidc.c | 2 | ||||
-rw-r--r-- | sound/oss/vidc_fill.S | 2 | ||||
-rw-r--r-- | sound/oss/waveartist.c | 2 | ||||
-rw-r--r-- | sound/soc/at91/eti_b1_wm8731.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/pxa2xx-ac97.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/pxa2xx-i2s.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/pxa2xx-pcm.c | 2 | ||||
-rw-r--r-- | sound/soc/s3c24xx/neo1973_wm8753.c | 2 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c2412-i2s.c | 2 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c2443-ac97.c | 2 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c24xx-i2s.c | 2 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c24xx-pcm.c | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 5b3274b465e..158f7b50b78 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | #include <asm/irq.h> | 27 | #include <asm/irq.h> |
28 | #include <linux/mutex.h> | 28 | #include <linux/mutex.h> |
29 | #include <asm/hardware.h> | 29 | #include <asm/arch/hardware.h> |
30 | #include <asm/arch/pxa-regs.h> | 30 | #include <asm/arch/pxa-regs.h> |
31 | #include <asm/arch/pxa2xx-gpio.h> | 31 | #include <asm/arch/pxa2xx-gpio.h> |
32 | #include <asm/arch/audio.h> | 32 | #include <asm/arch/audio.h> |
diff --git a/sound/arm/pxa2xx-pcm.c b/sound/arm/pxa2xx-pcm.c index 0ede9e4656a..9a104e2430f 100644 --- a/sound/arm/pxa2xx-pcm.c +++ b/sound/arm/pxa2xx-pcm.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <sound/pcm_params.h> | 21 | #include <sound/pcm_params.h> |
22 | 22 | ||
23 | #include <asm/dma.h> | 23 | #include <asm/dma.h> |
24 | #include <asm/hardware.h> | 24 | #include <asm/arch/hardware.h> |
25 | #include <asm/arch/pxa-regs.h> | 25 | #include <asm/arch/pxa-regs.h> |
26 | 26 | ||
27 | #include "pxa2xx-pcm.h" | 27 | #include "pxa2xx-pcm.h" |
diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c index faeddf3eced..40c213e7059 100644 --- a/sound/arm/sa11xx-uda1341.c +++ b/sound/arm/sa11xx-uda1341.c | |||
@@ -71,7 +71,7 @@ | |||
71 | #include <linux/pm.h> | 71 | #include <linux/pm.h> |
72 | #endif | 72 | #endif |
73 | 73 | ||
74 | #include <asm/hardware.h> | 74 | #include <asm/arch/hardware.h> |
75 | #include <asm/arch/h3600.h> | 75 | #include <asm/arch/h3600.h> |
76 | #include <asm/mach-types.h> | 76 | #include <asm/mach-types.h> |
77 | #include <asm/dma.h> | 77 | #include <asm/dma.h> |
diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c index bb4a0969f46..41cd4f25de0 100644 --- a/sound/oss/vidc.c +++ b/sound/oss/vidc.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
24 | 24 | ||
25 | #include <asm/hardware.h> | 25 | #include <asm/arch/hardware.h> |
26 | #include <asm/dma.h> | 26 | #include <asm/dma.h> |
27 | #include <asm/io.h> | 27 | #include <asm/io.h> |
28 | #include <asm/hardware/iomd.h> | 28 | #include <asm/hardware/iomd.h> |
diff --git a/sound/oss/vidc_fill.S b/sound/oss/vidc_fill.S index 01ccc074cc1..d2cb210cc40 100644 --- a/sound/oss/vidc_fill.S +++ b/sound/oss/vidc_fill.S | |||
@@ -11,7 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
13 | #include <asm/assembler.h> | 13 | #include <asm/assembler.h> |
14 | #include <asm/hardware.h> | 14 | #include <asm/arch/hardware.h> |
15 | #include <asm/hardware/iomd.h> | 15 | #include <asm/hardware/iomd.h> |
16 | 16 | ||
17 | .text | 17 | .text |
diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c index 88490418f93..d84c49787f6 100644 --- a/sound/oss/waveartist.c +++ b/sound/oss/waveartist.c | |||
@@ -47,7 +47,7 @@ | |||
47 | #include "waveartist.h" | 47 | #include "waveartist.h" |
48 | 48 | ||
49 | #ifdef CONFIG_ARM | 49 | #ifdef CONFIG_ARM |
50 | #include <asm/hardware.h> | 50 | #include <asm/arch/hardware.h> |
51 | #include <asm/mach-types.h> | 51 | #include <asm/mach-types.h> |
52 | #endif | 52 | #endif |
53 | 53 | ||
diff --git a/sound/soc/at91/eti_b1_wm8731.c b/sound/soc/at91/eti_b1_wm8731.c index d532de95424..d61a4537e60 100644 --- a/sound/soc/at91/eti_b1_wm8731.c +++ b/sound/soc/at91/eti_b1_wm8731.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include <sound/soc.h> | 33 | #include <sound/soc.h> |
34 | #include <sound/soc-dapm.h> | 34 | #include <sound/soc-dapm.h> |
35 | 35 | ||
36 | #include <asm/hardware.h> | 36 | #include <asm/arch/hardware.h> |
37 | #include <asm/arch/gpio.h> | 37 | #include <asm/arch/gpio.h> |
38 | 38 | ||
39 | #include "../codecs/wm8731.h" | 39 | #include "../codecs/wm8731.h" |
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index 059af815ea0..b45a4f199ef 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | #include <asm/irq.h> | 27 | #include <asm/irq.h> |
28 | #include <linux/mutex.h> | 28 | #include <linux/mutex.h> |
29 | #include <asm/hardware.h> | 29 | #include <asm/arch/hardware.h> |
30 | #include <asm/arch/pxa-regs.h> | 30 | #include <asm/arch/pxa-regs.h> |
31 | #include <asm/arch/pxa2xx-gpio.h> | 31 | #include <asm/arch/pxa2xx-gpio.h> |
32 | #include <asm/arch/audio.h> | 32 | #include <asm/arch/audio.h> |
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 8f96d87f7b4..f69870f4f67 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <sound/initval.h> | 21 | #include <sound/initval.h> |
22 | #include <sound/soc.h> | 22 | #include <sound/soc.h> |
23 | 23 | ||
24 | #include <asm/hardware.h> | 24 | #include <asm/arch/hardware.h> |
25 | #include <asm/arch/pxa-regs.h> | 25 | #include <asm/arch/pxa-regs.h> |
26 | #include <asm/arch/pxa2xx-gpio.h> | 26 | #include <asm/arch/pxa2xx-gpio.h> |
27 | #include <asm/arch/audio.h> | 27 | #include <asm/arch/audio.h> |
diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c index 2df03ee5819..77708f879c9 100644 --- a/sound/soc/pxa/pxa2xx-pcm.c +++ b/sound/soc/pxa/pxa2xx-pcm.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <sound/soc.h> | 22 | #include <sound/soc.h> |
23 | 23 | ||
24 | #include <asm/dma.h> | 24 | #include <asm/dma.h> |
25 | #include <asm/hardware.h> | 25 | #include <asm/arch/hardware.h> |
26 | #include <asm/arch/pxa-regs.h> | 26 | #include <asm/arch/pxa-regs.h> |
27 | #include <asm/arch/audio.h> | 27 | #include <asm/arch/audio.h> |
28 | 28 | ||
diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index 22e281ef639..47bf9a0aab7 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include <asm/hardware/scoop.h> | 27 | #include <asm/hardware/scoop.h> |
28 | #include <asm/arch/regs-clock.h> | 28 | #include <asm/arch/regs-clock.h> |
29 | #include <asm/arch/regs-gpio.h> | 29 | #include <asm/arch/regs-gpio.h> |
30 | #include <asm/hardware.h> | 30 | #include <asm/arch/hardware.h> |
31 | #include <asm/arch/audio.h> | 31 | #include <asm/arch/audio.h> |
32 | #include <linux/io.h> | 32 | #include <linux/io.h> |
33 | #include <asm/arch/spi-gpio.h> | 33 | #include <asm/arch/spi-gpio.h> |
diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c index ee4676ed128..59c3d5355f5 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/sound/soc/s3c24xx/s3c2412-i2s.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <sound/pcm_params.h> | 28 | #include <sound/pcm_params.h> |
29 | #include <sound/initval.h> | 29 | #include <sound/initval.h> |
30 | #include <sound/soc.h> | 30 | #include <sound/soc.h> |
31 | #include <asm/hardware.h> | 31 | #include <asm/arch/hardware.h> |
32 | 32 | ||
33 | #include <linux/io.h> | 33 | #include <linux/io.h> |
34 | #include <asm/dma.h> | 34 | #include <asm/dma.h> |
diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c index 783349b7fed..a37167398ab 100644 --- a/sound/soc/s3c24xx/s3c2443-ac97.c +++ b/sound/soc/s3c24xx/s3c2443-ac97.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include <sound/initval.h> | 27 | #include <sound/initval.h> |
28 | #include <sound/soc.h> | 28 | #include <sound/soc.h> |
29 | 29 | ||
30 | #include <asm/hardware.h> | 30 | #include <asm/arch/hardware.h> |
31 | #include <asm/plat-s3c/regs-ac97.h> | 31 | #include <asm/plat-s3c/regs-ac97.h> |
32 | #include <asm/arch/regs-gpio.h> | 32 | #include <asm/arch/regs-gpio.h> |
33 | #include <asm/arch/regs-clock.h> | 33 | #include <asm/arch/regs-clock.h> |
diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index 397524282b5..ff614d645e7 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include <sound/initval.h> | 27 | #include <sound/initval.h> |
28 | #include <sound/soc.h> | 28 | #include <sound/soc.h> |
29 | 29 | ||
30 | #include <asm/hardware.h> | 30 | #include <asm/arch/hardware.h> |
31 | #include <asm/arch/regs-gpio.h> | 31 | #include <asm/arch/regs-gpio.h> |
32 | #include <asm/arch/regs-clock.h> | 32 | #include <asm/arch/regs-clock.h> |
33 | #include <asm/arch/audio.h> | 33 | #include <asm/arch/audio.h> |
diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c index cef79b34dc6..fadd33e2a73 100644 --- a/sound/soc/s3c24xx/s3c24xx-pcm.c +++ b/sound/soc/s3c24xx/s3c24xx-pcm.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include <sound/soc.h> | 27 | #include <sound/soc.h> |
28 | 28 | ||
29 | #include <asm/dma.h> | 29 | #include <asm/dma.h> |
30 | #include <asm/hardware.h> | 30 | #include <asm/arch/hardware.h> |
31 | #include <asm/arch/dma.h> | 31 | #include <asm/arch/dma.h> |
32 | #include <asm/arch/audio.h> | 32 | #include <asm/arch/audio.h> |
33 | 33 | ||