Hi All,

This patch series aims to merge pata_of_platform into pata_platform
driver.

Note:
* The patches have been build tested only.
* Other thing I'm concerned about is the Copyright message which
  existed in pata_of_platform.c should that be pasted in pata_platform.c?

Cheers,
Prabhakar

Lad Prabhakar (2):
  ata: pata_platform: make use of platform_get_mem_or_io()
  ata: pata_platform: Merge pata_of_platform into pata_platform

 drivers/ata/Kconfig            |   3 +-
 drivers/ata/Makefile           |   1 -
 drivers/ata/pata_of_platform.c |  90 --------------
 drivers/ata/pata_platform.c    | 209 ++++++++++++++++++++++++---------
 include/linux/ata_platform.h   |   9 --
 5 files changed, 155 insertions(+), 157 deletions(-)
 delete mode 100644 drivers/ata/pata_of_platform.c

-- 
2.17.1