Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 15a453a955f89f6545118770c669b52e925368bd

Authored by Bartlomiej Zolnierkiewicz
1 parent 443d18c807

ide: include <asm/ide.h> only when needed 

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Showing 4 changed files with 11 additions and 7 deletions Side-by-side Diff

drivers/ide/ide-io-std.c
Diff comments   View file @ 15a453a
... ... @@ -2,6 +2,13 @@
2 2 #include <linux/kernel.h>
3 3 #include <linux/ide.h>
4 4  
  5 +#if defined(CONFIG_ARM) || defined(CONFIG_M68K) || defined(CONFIG_MIPS) || \
  6 + defined(CONFIG_PARISC) || defined(CONFIG_PPC) || defined(CONFIG_SPARC)
  7 +#include <asm/ide.h>
  8 +#else
  9 +#include <asm-generic/ide_iops.h>
  10 +#endif
  11 +
5 12 /*
6 13 * Conventional PIO operations for ATA devices
7 14 */
drivers/ide/tx4938ide.c
Diff comments   View file @ 15a453a
... ... @@ -15,6 +15,8 @@
15 15 #include <linux/init.h>
16 16 #include <linux/platform_device.h>
17 17 #include <linux/io.h>
  18 +
  19 +#include <asm/ide.h>
18 20 #include <asm/txx9/tx4938.h>
19 21  
20 22 static void tx4938ide_tune_ebusc(unsigned int ebus_ch,
drivers/ide/tx4939ide.c
Diff comments   View file @ 15a453a
... ... @@ -18,6 +18,8 @@
18 18 #include <linux/io.h>
19 19 #include <linux/scatterlist.h>
20 20  
  21 +#include <asm/ide.h>
  22 +
21 23 #define MODNAME "tx4939ide"
22 24  
23 25 /* ATA Shadow Registers (8-bit except for Data which is 16-bit) */
... ... @@ -193,13 +193,6 @@
193 193 hw->io_ports.ctl_addr = ctl_addr;
194 194 }
195 195  
196   -#if defined(CONFIG_ARM) || defined(CONFIG_M68K) || defined(CONFIG_MIPS) || \
197   - defined(CONFIG_PARISC) || defined(CONFIG_PPC) || defined(CONFIG_SPARC)
198   -#include <asm/ide.h>
199   -#else
200   -#include <asm-generic/ide_iops.h>
201   -#endif
202   -
203 196 #define MAX_HWIFS 10
204 197  
205 198 /*