Commit 5af5073004071cedd0343eee51d77955037ec6f3

Authored by Rob Herring
1 parent 5c9f303e99

drivers: clean-up prom.h implicit includes

Powerpc is a mess of implicit includes by prom.h. Add the necessary
explicit includes to drivers in preparation of prom.h cleanup.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Grant Likely <grant.likely@linaro.org>

Showing 70 changed files with 108 additions and 2 deletions Side-by-side Diff

drivers/ata/sata_fsl.c
... ... @@ -24,6 +24,8 @@
24 24 #include <scsi/scsi_cmnd.h>
25 25 #include <linux/libata.h>
26 26 #include <asm/io.h>
  27 +#include <linux/of_address.h>
  28 +#include <linux/of_irq.h>
27 29 #include <linux/of_platform.h>
28 30  
29 31 static unsigned int intr_coalescing_count;
... ... @@ -21,6 +21,7 @@
21 21  
22 22 #include <linux/kernel.h>
23 23 #include <linux/of.h>
  24 +#include <linux/of_address.h>
24 25 #include <linux/of_device.h>
25 26 #include <linux/of_platform.h>
26 27 #include <linux/fs.h>
drivers/char/hw_random/pasemi-rng.c
... ... @@ -24,6 +24,7 @@
24 24 #include <linux/platform_device.h>
25 25 #include <linux/hw_random.h>
26 26 #include <linux/delay.h>
  27 +#include <linux/of_address.h>
27 28 #include <linux/of_platform.h>
28 29 #include <asm/io.h>
29 30  
drivers/cpufreq/pasemi-cpufreq.c
... ... @@ -28,6 +28,7 @@
28 28 #include <linux/cpufreq.h>
29 29 #include <linux/timer.h>
30 30 #include <linux/module.h>
  31 +#include <linux/of_address.h>
31 32  
32 33 #include <asm/hw_irq.h>
33 34 #include <asm/io.h>
drivers/crypto/caam/ctrl.c
... ... @@ -5,6 +5,9 @@
5 5 * Copyright 2008-2012 Freescale Semiconductor, Inc.
6 6 */
7 7  
  8 +#include <linux/of_address.h>
  9 +#include <linux/of_irq.h>
  10 +
8 11 #include "compat.h"
9 12 #include "regs.h"
10 13 #include "intern.h"
drivers/crypto/caam/jr.c
... ... @@ -5,6 +5,8 @@
5 5 * Copyright 2008-2012 Freescale Semiconductor, Inc.
6 6 */
7 7  
  8 +#include <linux/of_irq.h>
  9 +
8 10 #include "compat.h"
9 11 #include "regs.h"
10 12 #include "jr.h"
drivers/crypto/talitos.c
... ... @@ -32,6 +32,8 @@
32 32 #include <linux/interrupt.h>
33 33 #include <linux/crypto.h>
34 34 #include <linux/hw_random.h>
  35 +#include <linux/of_address.h>
  36 +#include <linux/of_irq.h>
35 37 #include <linux/of_platform.h>
36 38 #include <linux/dma-mapping.h>
37 39 #include <linux/io.h>
drivers/dma/bestcomm/sram.c
... ... @@ -19,6 +19,7 @@
19 19 #include <linux/string.h>
20 20 #include <linux/ioport.h>
21 21 #include <linux/of.h>
  22 +#include <linux/of_address.h>
22 23  
23 24 #include <asm/io.h>
24 25 #include <asm/mmu.h>
drivers/dma/fsldma.c
... ... @@ -33,6 +33,8 @@
33 33 #include <linux/delay.h>
34 34 #include <linux/dma-mapping.h>
35 35 #include <linux/dmapool.h>
  36 +#include <linux/of_address.h>
  37 +#include <linux/of_irq.h>
36 38 #include <linux/of_platform.h>
37 39  
38 40 #include "dmaengine.h"
drivers/dma/mpc512x_dma.c
... ... @@ -39,7 +39,9 @@
39 39 #include <linux/interrupt.h>
40 40 #include <linux/io.h>
41 41 #include <linux/slab.h>
  42 +#include <linux/of_address.h>
42 43 #include <linux/of_device.h>
  44 +#include <linux/of_irq.h>
43 45 #include <linux/of_platform.h>
44 46  
45 47 #include <linux/random.h>
drivers/edac/cell_edac.c
... ... @@ -15,6 +15,7 @@
15 15 #include <linux/platform_device.h>
16 16 #include <linux/stop_machine.h>
17 17 #include <linux/io.h>
  18 +#include <linux/of_address.h>
18 19 #include <asm/machdep.h>
19 20 #include <asm/cell-regs.h>
20 21  
drivers/gpio/gpio-mpc8xxx.c
... ... @@ -14,6 +14,7 @@
14 14 #include <linux/io.h>
15 15 #include <linux/of.h>
16 16 #include <linux/of_gpio.h>
  17 +#include <linux/of_irq.h>
17 18 #include <linux/gpio.h>
18 19 #include <linux/slab.h>
19 20 #include <linux/irq.h>
drivers/i2c/busses/i2c-ibm_iic.c
... ... @@ -41,6 +41,8 @@
41 41 #include <asm/irq.h>
42 42 #include <linux/io.h>
43 43 #include <linux/i2c.h>
  44 +#include <linux/of_address.h>
  45 +#include <linux/of_irq.h>
44 46 #include <linux/of_platform.h>
45 47  
46 48 #include "i2c-ibm_iic.h"
drivers/i2c/busses/i2c-mpc.c
... ... @@ -17,6 +17,8 @@
17 17 #include <linux/module.h>
18 18 #include <linux/sched.h>
19 19 #include <linux/init.h>
  20 +#include <linux/of_address.h>
  21 +#include <linux/of_irq.h>
20 22 #include <linux/of_platform.h>
21 23 #include <linux/slab.h>
22 24  
drivers/i2c/busses/i2c-powermac.c
... ... @@ -27,6 +27,7 @@
27 27 #include <linux/init.h>
28 28 #include <linux/device.h>
29 29 #include <linux/platform_device.h>
  30 +#include <linux/of_irq.h>
30 31 #include <asm/prom.h>
31 32 #include <asm/pmac_low_i2c.h>
32 33  
drivers/input/serio/xilinx_ps2.c
... ... @@ -25,6 +25,7 @@
25 25 #include <linux/io.h>
26 26 #include <linux/of_address.h>
27 27 #include <linux/of_device.h>
  28 +#include <linux/of_irq.h>
28 29 #include <linux/of_platform.h>
29 30  
30 31 #define DRIVER_NAME "xilinx_ps2"
drivers/macintosh/macio_asic.c
... ... @@ -24,6 +24,8 @@
24 24 #include <linux/init.h>
25 25 #include <linux/module.h>
26 26 #include <linux/slab.h>
  27 +#include <linux/of_address.h>
  28 +#include <linux/of_irq.h>
27 29  
28 30 #include <asm/machdep.h>
29 31 #include <asm/macio.h>
drivers/macintosh/rack-meter.c
... ... @@ -25,6 +25,8 @@
25 25 #include <linux/pci.h>
26 26 #include <linux/dma-mapping.h>
27 27 #include <linux/kernel_stat.h>
  28 +#include <linux/of_address.h>
  29 +#include <linux/of_irq.h>
28 30  
29 31 #include <asm/io.h>
30 32 #include <asm/prom.h>
drivers/macintosh/smu.c
... ... @@ -35,6 +35,7 @@
35 35 #include <linux/poll.h>
36 36 #include <linux/mutex.h>
37 37 #include <linux/of_device.h>
  38 +#include <linux/of_irq.h>
38 39 #include <linux/of_platform.h>
39 40 #include <linux/slab.h>
40 41  
drivers/macintosh/via-pmu.c
... ... @@ -46,6 +46,8 @@
46 46 #include <linux/suspend.h>
47 47 #include <linux/cpu.h>
48 48 #include <linux/compat.h>
  49 +#include <linux/of_address.h>
  50 +#include <linux/of_irq.h>
49 51 #include <asm/prom.h>
50 52 #include <asm/machdep.h>
51 53 #include <asm/io.h>
drivers/media/platform/fsl-viu.c
... ... @@ -21,6 +21,8 @@
21 21 #include <linux/init.h>
22 22 #include <linux/interrupt.h>
23 23 #include <linux/io.h>
  24 +#include <linux/of_address.h>
  25 +#include <linux/of_irq.h>
24 26 #include <linux/of_platform.h>
25 27 #include <linux/slab.h>
26 28 #include <media/v4l2-common.h>
drivers/misc/carma/carma-fpga-program.c
... ... @@ -10,6 +10,8 @@
10 10 */
11 11  
12 12 #include <linux/dma-mapping.h>
  13 +#include <linux/of_address.h>
  14 +#include <linux/of_irq.h>
13 15 #include <linux/of_platform.h>
14 16 #include <linux/completion.h>
15 17 #include <linux/miscdevice.h>
drivers/misc/carma/carma-fpga.c
... ... @@ -88,6 +88,8 @@
88 88 * interrupt source to the GPIO pin. Tada, we hid the interrupt. :)
89 89 */
90 90  
  91 +#include <linux/of_address.h>
  92 +#include <linux/of_irq.h>
91 93 #include <linux/of_platform.h>
92 94 #include <linux/dma-mapping.h>
93 95 #include <linux/miscdevice.h>
drivers/mtd/nand/fsl_elbc_nand.c
... ... @@ -28,6 +28,7 @@
28 28 #include <linux/kernel.h>
29 29 #include <linux/string.h>
30 30 #include <linux/ioport.h>
  31 +#include <linux/of_address.h>
31 32 #include <linux/of_platform.h>
32 33 #include <linux/platform_device.h>
33 34 #include <linux/slab.h>
drivers/mtd/nand/fsl_ifc_nand.c
... ... @@ -24,6 +24,7 @@
24 24 #include <linux/types.h>
25 25 #include <linux/init.h>
26 26 #include <linux/kernel.h>
  27 +#include <linux/of_address.h>
27 28 #include <linux/slab.h>
28 29 #include <linux/mtd/mtd.h>
29 30 #include <linux/mtd/nand.h>
drivers/mtd/nand/fsl_upm.c
... ... @@ -18,6 +18,7 @@
18 18 #include <linux/mtd/nand_ecc.h>
19 19 #include <linux/mtd/partitions.h>
20 20 #include <linux/mtd/mtd.h>
  21 +#include <linux/of_address.h>
21 22 #include <linux/of_platform.h>
22 23 #include <linux/of_gpio.h>
23 24 #include <linux/io.h>
drivers/mtd/nand/mpc5121_nfc.c
... ... @@ -36,7 +36,9 @@
36 36 #include <linux/mtd/mtd.h>
37 37 #include <linux/mtd/nand.h>
38 38 #include <linux/mtd/partitions.h>
  39 +#include <linux/of_address.h>
39 40 #include <linux/of_device.h>
  41 +#include <linux/of_irq.h>
40 42 #include <linux/of_platform.h>
41 43  
42 44 #include <asm/mpc5121.h>
drivers/mtd/nand/ndfc.c
... ... @@ -30,6 +30,7 @@
30 30 #include <linux/mtd/ndfc.h>
31 31 #include <linux/slab.h>
32 32 #include <linux/mtd/mtd.h>
  33 +#include <linux/of_address.h>
33 34 #include <linux/of_platform.h>
34 35 #include <asm/io.h>
35 36  
drivers/mtd/nand/pasemi_nand.c
... ... @@ -28,6 +28,8 @@
28 28 #include <linux/mtd/mtd.h>
29 29 #include <linux/mtd/nand.h>
30 30 #include <linux/mtd/nand_ecc.h>
  31 +#include <linux/of_address.h>
  32 +#include <linux/of_irq.h>
31 33 #include <linux/of_platform.h>
32 34 #include <linux/platform_device.h>
33 35 #include <linux/pci.h>
drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
... ... @@ -32,7 +32,9 @@
32 32 #include <linux/fs.h>
33 33 #include <linux/platform_device.h>
34 34 #include <linux/phy.h>
  35 +#include <linux/of_address.h>
35 36 #include <linux/of_device.h>
  37 +#include <linux/of_irq.h>
36 38 #include <linux/gfp.h>
37 39  
38 40 #include <asm/immap_cpm2.h>
drivers/net/ethernet/freescale/fs_enet/mac-fec.c
... ... @@ -31,7 +31,9 @@
31 31 #include <linux/bitops.h>
32 32 #include <linux/fs.h>
33 33 #include <linux/platform_device.h>
  34 +#include <linux/of_address.h>
34 35 #include <linux/of_device.h>
  36 +#include <linux/of_irq.h>
35 37 #include <linux/gfp.h>
36 38  
37 39 #include <asm/irq.h>
drivers/net/ethernet/freescale/fs_enet/mac-scc.c
... ... @@ -31,6 +31,8 @@
31 31 #include <linux/bitops.h>
32 32 #include <linux/fs.h>
33 33 #include <linux/platform_device.h>
  34 +#include <linux/of_address.h>
  35 +#include <linux/of_irq.h>
34 36 #include <linux/of_platform.h>
35 37  
36 38 #include <asm/irq.h>
drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
... ... @@ -22,6 +22,7 @@
22 22 #include <linux/mii.h>
23 23 #include <linux/platform_device.h>
24 24 #include <linux/mdio-bitbang.h>
  25 +#include <linux/of_address.h>
25 26 #include <linux/of_mdio.h>
26 27 #include <linux/of_platform.h>
27 28  
drivers/net/ethernet/freescale/fs_enet/mii-fec.c
... ... @@ -31,6 +31,7 @@
31 31 #include <linux/ethtool.h>
32 32 #include <linux/bitops.h>
33 33 #include <linux/platform_device.h>
  34 +#include <linux/of_address.h>
34 35 #include <linux/of_platform.h>
35 36  
36 37 #include <asm/pgtable.h>
drivers/net/ethernet/freescale/gianfar.c
... ... @@ -78,6 +78,8 @@
78 78 #include <linux/if_vlan.h>
79 79 #include <linux/spinlock.h>
80 80 #include <linux/mm.h>
  81 +#include <linux/of_address.h>
  82 +#include <linux/of_irq.h>
81 83 #include <linux/of_mdio.h>
82 84 #include <linux/of_platform.h>
83 85 #include <linux/ip.h>
drivers/net/ethernet/freescale/ucc_geth.c
... ... @@ -31,6 +31,8 @@
31 31 #include <linux/mii.h>
32 32 #include <linux/phy.h>
33 33 #include <linux/workqueue.h>
  34 +#include <linux/of_address.h>
  35 +#include <linux/of_irq.h>
34 36 #include <linux/of_mdio.h>
35 37 #include <linux/of_net.h>
36 38 #include <linux/of_platform.h>
drivers/net/ethernet/freescale/xgmac_mdio.c
... ... @@ -17,6 +17,7 @@
17 17 #include <linux/module.h>
18 18 #include <linux/phy.h>
19 19 #include <linux/mdio.h>
  20 +#include <linux/of_address.h>
20 21 #include <linux/of_platform.h>
21 22 #include <linux/of_mdio.h>
22 23  
drivers/net/ethernet/ibm/emac/core.c
... ... @@ -39,6 +39,8 @@
39 39 #include <linux/bitops.h>
40 40 #include <linux/workqueue.h>
41 41 #include <linux/of.h>
  42 +#include <linux/of_address.h>
  43 +#include <linux/of_irq.h>
42 44 #include <linux/of_net.h>
43 45 #include <linux/slab.h>
44 46  
drivers/net/ethernet/ibm/emac/mal.c
... ... @@ -27,6 +27,7 @@
27 27  
28 28 #include <linux/delay.h>
29 29 #include <linux/slab.h>
  30 +#include <linux/of_irq.h>
30 31  
31 32 #include "core.h"
32 33 #include <asm/dcr-regs.h>
drivers/net/ethernet/ibm/emac/rgmii.c
... ... @@ -24,6 +24,7 @@
24 24 #include <linux/slab.h>
25 25 #include <linux/kernel.h>
26 26 #include <linux/ethtool.h>
  27 +#include <linux/of_address.h>
27 28 #include <asm/io.h>
28 29  
29 30 #include "emac.h"
drivers/net/ethernet/ibm/emac/tah.c
... ... @@ -18,6 +18,7 @@
18 18 * Free Software Foundation; either version 2 of the License, or (at your
19 19 * option) any later version.
20 20 */
  21 +#include <linux/of_address.h>
21 22 #include <asm/io.h>
22 23  
23 24 #include "emac.h"
drivers/net/ethernet/ibm/emac/zmii.c
... ... @@ -24,6 +24,7 @@
24 24 #include <linux/slab.h>
25 25 #include <linux/kernel.h>
26 26 #include <linux/ethtool.h>
  27 +#include <linux/of_address.h>
27 28 #include <asm/io.h>
28 29  
29 30 #include "emac.h"
drivers/pcmcia/electra_cf.c
... ... @@ -30,6 +30,8 @@
30 30 #include <linux/interrupt.h>
31 31 #include <linux/mm.h>
32 32 #include <linux/vmalloc.h>
  33 +#include <linux/of_address.h>
  34 +#include <linux/of_irq.h>
33 35 #include <linux/of_platform.h>
34 36 #include <linux/slab.h>
35 37  
drivers/rtc/rtc-mpc5121.c
... ... @@ -14,7 +14,9 @@
14 14 #include <linux/module.h>
15 15 #include <linux/rtc.h>
16 16 #include <linux/of.h>
  17 +#include <linux/of_address.h>
17 18 #include <linux/of_device.h>
  19 +#include <linux/of_irq.h>
18 20 #include <linux/of_platform.h>
19 21 #include <linux/io.h>
20 22 #include <linux/slab.h>
drivers/spi/spi-fsl-cpm.c
... ... @@ -20,6 +20,7 @@
20 20 #include <linux/spi/spi.h>
21 21 #include <linux/fsl_devices.h>
22 22 #include <linux/dma-mapping.h>
  23 +#include <linux/of_address.h>
23 24 #include <asm/cpm.h>
24 25 #include <asm/qe.h>
25 26  
drivers/spi/spi-fsl-espi.c
... ... @@ -16,6 +16,8 @@
16 16 #include <linux/fsl_devices.h>
17 17 #include <linux/mm.h>
18 18 #include <linux/of.h>
  19 +#include <linux/of_address.h>
  20 +#include <linux/of_irq.h>
19 21 #include <linux/of_platform.h>
20 22 #include <linux/interrupt.h>
21 23 #include <linux/err.h>
drivers/spi/spi-mpc512x-psc.c
... ... @@ -20,6 +20,7 @@
20 20 #include <linux/errno.h>
21 21 #include <linux/interrupt.h>
22 22 #include <linux/of_address.h>
  23 +#include <linux/of_irq.h>
23 24 #include <linux/of_platform.h>
24 25 #include <linux/completion.h>
25 26 #include <linux/io.h>
drivers/tty/ehv_bytechan.c
... ... @@ -32,6 +32,7 @@
32 32 #include <linux/poll.h>
33 33 #include <asm/epapr_hcalls.h>
34 34 #include <linux/of.h>
  35 +#include <linux/of_irq.h>
35 36 #include <linux/platform_device.h>
36 37 #include <linux/cdev.h>
37 38 #include <linux/console.h>
drivers/tty/serial/cpm_uart/cpm_uart_core.c
... ... @@ -41,6 +41,8 @@
41 41 #include <linux/bootmem.h>
42 42 #include <linux/dma-mapping.h>
43 43 #include <linux/fs_uart_pd.h>
  44 +#include <linux/of_address.h>
  45 +#include <linux/of_irq.h>
44 46 #include <linux/of_platform.h>
45 47 #include <linux/gpio.h>
46 48 #include <linux/of_gpio.h>
drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c
... ... @@ -45,6 +45,7 @@
45 45 #include <linux/kernel.h>
46 46  
47 47 #include <linux/of.h>
  48 +#include <linux/of_address.h>
48 49  
49 50 #include "cpm_uart.h"
50 51  
drivers/tty/serial/pmac_zilog.c
... ... @@ -57,6 +57,8 @@
57 57 #include <linux/bitops.h>
58 58 #include <linux/sysrq.h>
59 59 #include <linux/mutex.h>
  60 +#include <linux/of_address.h>
  61 +#include <linux/of_irq.h>
60 62 #include <asm/sections.h>
61 63 #include <asm/io.h>
62 64 #include <asm/irq.h>
drivers/tty/serial/ucc_uart.c
... ... @@ -25,6 +25,8 @@
25 25 #include <linux/tty.h>
26 26 #include <linux/tty_flip.h>
27 27 #include <linux/io.h>
  28 +#include <linux/of_address.h>
  29 +#include <linux/of_irq.h>
28 30 #include <linux/of_platform.h>
29 31 #include <linux/dma-mapping.h>
30 32  
drivers/usb/gadget/fsl_qe_udc.c
... ... @@ -33,6 +33,7 @@
33 33 #include <linux/io.h>
34 34 #include <linux/moduleparam.h>
35 35 #include <linux/of_address.h>
  36 +#include <linux/of_irq.h>
36 37 #include <linux/of_platform.h>
37 38 #include <linux/dma-mapping.h>
38 39 #include <linux/usb/ch9.h>
drivers/usb/host/ehci-ppc-of.c
... ... @@ -16,6 +16,8 @@
16 16 #include <linux/signal.h>
17 17  
18 18 #include <linux/of.h>
  19 +#include <linux/of_address.h>
  20 +#include <linux/of_irq.h>
19 21 #include <linux/of_platform.h>
20 22  
21 23  
drivers/usb/host/fhci-hcd.c
... ... @@ -26,6 +26,8 @@
26 26 #include <linux/io.h>
27 27 #include <linux/usb.h>
28 28 #include <linux/usb/hcd.h>
  29 +#include <linux/of_address.h>
  30 +#include <linux/of_irq.h>
29 31 #include <linux/of_platform.h>
30 32 #include <linux/of_gpio.h>
31 33 #include <linux/slab.h>
drivers/usb/host/ohci-ppc-of.c
... ... @@ -14,6 +14,8 @@
14 14 */
15 15  
16 16 #include <linux/signal.h>
  17 +#include <linux/of_address.h>
  18 +#include <linux/of_irq.h>
17 19 #include <linux/of_platform.h>
18 20  
19 21 #include <asm/prom.h>
drivers/video/fsl-diu-fb.c
... ... @@ -31,6 +31,8 @@
31 31 #include <linux/uaccess.h>
32 32 #include <linux/vmalloc.h>
33 33 #include <linux/spinlock.h>
  34 +#include <linux/of_address.h>
  35 +#include <linux/of_irq.h>
34 36  
35 37 #include <sysdev/fsl_soc.h>
36 38 #include <linux/fsl-diu-fb.h>
drivers/virt/fsl_hypervisor.c
... ... @@ -34,6 +34,7 @@
34 34 #include <linux/slab.h>
35 35 #include <linux/poll.h>
36 36 #include <linux/of.h>
  37 +#include <linux/of_irq.h>
37 38 #include <linux/reboot.h>
38 39 #include <linux/uaccess.h>
39 40 #include <linux/notifier.h>
drivers/watchdog/gef_wdt.c
... ... @@ -34,6 +34,7 @@
34 34 #include <linux/watchdog.h>
35 35 #include <linux/fs.h>
36 36 #include <linux/of.h>
  37 +#include <linux/of_address.h>
37 38 #include <linux/of_platform.h>
38 39 #include <linux/io.h>
39 40 #include <linux/uaccess.h>
drivers/watchdog/mpc8xxx_wdt.c
... ... @@ -24,6 +24,7 @@
24 24 #include <linux/kernel.h>
25 25 #include <linux/timer.h>
26 26 #include <linux/miscdevice.h>
  27 +#include <linux/of_address.h>
27 28 #include <linux/of_platform.h>
28 29 #include <linux/module.h>
29 30 #include <linux/watchdog.h>
sound/aoa/core/gpio-feature.c
... ... @@ -10,8 +10,9 @@
10 10 * registers.
11 11 */
12 12  
13   -#include <asm/pmac_feature.h>
  13 +#include <linux/of_irq.h>
14 14 #include <linux/interrupt.h>
  15 +#include <asm/pmac_feature.h>
15 16 #include "../aoa.h"
16 17  
17 18 /* TODO: these are lots of global variables
sound/aoa/soundbus/i2sbus/core.c
... ... @@ -11,6 +11,8 @@
11 11 #include <linux/pci.h>
12 12 #include <linux/interrupt.h>
13 13 #include <linux/dma-mapping.h>
  14 +#include <linux/of_address.h>
  15 +#include <linux/of_irq.h>
14 16  
15 17 #include <sound/core.h>
16 18  
... ... @@ -28,6 +28,8 @@
28 28 #include <linux/interrupt.h>
29 29 #include <linux/pci.h>
30 30 #include <linux/dma-mapping.h>
  31 +#include <linux/of_address.h>
  32 +#include <linux/of_irq.h>
31 33 #include <sound/core.h>
32 34 #include "pmac.h"
33 35 #include <sound/pcm_params.h>
... ... @@ -31,6 +31,7 @@
31 31 #include <linux/slab.h>
32 32 #include <linux/interrupt.h>
33 33 #include <linux/string.h>
  34 +#include <linux/of_irq.h>
34 35 #include <sound/core.h>
35 36 #include <asm/io.h>
36 37 #include <asm/irq.h>
sound/soc/fsl/fsl_dma.c
... ... @@ -21,6 +21,8 @@
21 21 #include <linux/interrupt.h>
22 22 #include <linux/delay.h>
23 23 #include <linux/gfp.h>
  24 +#include <linux/of_address.h>
  25 +#include <linux/of_irq.h>
24 26 #include <linux/of_platform.h>
25 27 #include <linux/list.h>
26 28 #include <linux/slab.h>
sound/soc/fsl/mpc5200_dma.c
... ... @@ -10,6 +10,8 @@
10 10 #include <linux/of_device.h>
11 11 #include <linux/dma-mapping.h>
12 12 #include <linux/slab.h>
  13 +#include <linux/of_address.h>
  14 +#include <linux/of_irq.h>
13 15 #include <linux/of_platform.h>
14 16  
15 17 #include <sound/soc.h>
sound/soc/fsl/mpc5200_psc_ac97.c
... ... @@ -291,7 +291,7 @@
291 291  
292 292 rc = snd_soc_set_ac97_ops(&psc_ac97_ops);
293 293 if (rc != 0) {
294   - dev_err(&op->dev, "Failed to set AC'97 ops: %d\n", ret);
  294 + dev_err(&op->dev, "Failed to set AC'97 ops: %d\n", rc);
295 295 return rc;
296 296 }
297 297  
sound/soc/fsl/mpc8610_hpcd.c
... ... @@ -12,6 +12,7 @@
12 12  
13 13 #include <linux/module.h>
14 14 #include <linux/interrupt.h>
  15 +#include <linux/of_address.h>
15 16 #include <linux/of_device.h>
16 17 #include <linux/slab.h>
17 18 #include <sound/soc.h>
sound/soc/fsl/p1022_ds.c
... ... @@ -12,6 +12,7 @@
12 12  
13 13 #include <linux/module.h>
14 14 #include <linux/interrupt.h>
  15 +#include <linux/of_address.h>
15 16 #include <linux/of_device.h>
16 17 #include <linux/slab.h>
17 18 #include <sound/soc.h>
sound/soc/fsl/p1022_rdk.c
... ... @@ -19,6 +19,7 @@
19 19  
20 20 #include <linux/module.h>
21 21 #include <linux/interrupt.h>
  22 +#include <linux/of_address.h>
22 23 #include <linux/of_device.h>
23 24 #include <linux/slab.h>
24 25 #include <sound/soc.h>