Commit 44d94e8d authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge branch 'pxa-cleanup' into devel

parents 63f57cd4 88f718e3

arch/arm/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -559,7 +559,6 @@ config ARCH_MMP 
	select GPIO_PXA

	select IRQ_DOMAIN

	select MULTI_IRQ_HANDLER

	select NEED_MACH_GPIO_H

	select PINCTRL

	select PLAT_PXA

	select SPARSE_IRQ
@@ -622,7 +621,6 @@ config ARCH_PXA 
	select GPIO_PXA

	select HAVE_IDE

	select MULTI_IRQ_HANDLER

	select NEED_MACH_GPIO_H

	select PLAT_PXA

	select SPARSE_IRQ

	help

arch/arm/mach-mmp/include/mach/gpio.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
#ifndef __ASM_MACH_GPIO_H

#define __ASM_MACH_GPIO_H



#include <asm-generic/gpio.h>



#include <mach/cputype.h>



#endif /* __ASM_MACH_GPIO_H */

arch/arm/mach-pxa/include/mach/gpio.h

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-pxa/include/mach/gpio.h

 *

 * PXA GPIO wrappers for arch-neutral GPIO calls

 *

 * Written by Philipp Zabel <philipp.zabel@gmail.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

 *

 */



#ifndef __ASM_ARCH_PXA_GPIO_H

#define __ASM_ARCH_PXA_GPIO_H



#include <asm-generic/gpio.h>



#include <mach/irqs.h>

#include <mach/hardware.h>



#endif