Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2dd550b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  ata_piix.c:piix_init_one() must be __devinit
  sata_via.c: Remove missleading comment.
  libata-core: unblacklist HITACHI drives
  sata_nv: fix ATAPI issues with memory over 4GB (v7)
  ata: drivers/ata/sata_mv.c needs dmapool.h
  libata: kill now unused n_iter and fix sata_fsl
  ahci: fix CAP.NP and PI handling
  sata_mv: Support SoC controllers
  Rename: linux/pata_platform.h to linux/ata_platform.h
parents 8755e568 bc5468f5

arch/arm/mach-rpc/riscpc.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/sched.h>

#include <linux/device.h>

#include <linux/serial_8250.h>

#include <linux/pata_platform.h>

#include <linux/ata_platform.h>



#include <asm/elf.h>

#include <asm/io.h>

arch/blackfin/mach-bf527/boards/ezkit.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)

#include <linux/usb/isp1362.h>

#endif

#include <linux/pata_platform.h>

#include <linux/ata_platform.h>

#include <linux/irq.h>

#include <linux/interrupt.h>

#include <linux/usb/sl811.h>

arch/blackfin/mach-bf533/boards/H8606.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)

#include <linux/usb/isp1362.h>

#endif

#include <linux/pata_platform.h>

#include <linux/ata_platform.h>

#include <linux/irq.h>



#include <asm/dma.h>

arch/blackfin/mach-bf533/boards/cm_bf533.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/flash.h>

#include <linux/usb/isp1362.h>

#include <linux/pata_platform.h>

#include <linux/ata_platform.h>

#include <linux/irq.h>

#include <asm/dma.h>

#include <asm/bfin5xx_spi.h>

arch/blackfin/mach-bf533/boards/ezkit.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/flash.h>

#include <linux/usb/isp1362.h>

#include <linux/pata_platform.h>

#include <linux/ata_platform.h>

#include <linux/irq.h>

#include <asm/dma.h>

#include <asm/bfin5xx_spi.h>