Merge branch 'header-move' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 (a1b81a84) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/avr32/Makefile

+6 −1

Original line number	Diff line number	Diff line
		@@ -23,9 +23,14 @@ KBUILD_AFLAGS += $(cpuflags-y)

		CHECKFLAGS += -D__avr32__ -D__BIG_ENDIAN

		machine-$(CONFIG_PLATFORM_AT32AP) := at32ap
		machdirs := $(patsubst %,arch/avr32/mach-%/, $(machine-y))

		KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs))

		head-$(CONFIG_LOADER_U_BOOT) += arch/avr32/boot/u-boot/head.o
		head-y += arch/avr32/kernel/head.o
		core-$(CONFIG_PLATFORM_AT32AP) += arch/avr32/mach-at32ap/
		core-y += $(machdirs)
		core-$(CONFIG_BOARD_ATSTK1000) += arch/avr32/boards/atstk1000/
		core-$(CONFIG_BOARD_ATNGW100) += arch/avr32/boards/atngw100/
		core-$(CONFIG_LOADER_U_BOOT) += arch/avr32/boot/u-boot/

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		#include <linux/mtd/partitions.h>
		#include <linux/mtd/physmap.h>

		#include <asm/arch/smc.h>
		#include <mach/smc.h>

		static struct smc_timing flash_timing __initdata = {
		.ncs_read_setup = 0,

+4 −4

Original line number	Diff line number	Diff line
		@@ -23,10 +23,10 @@
		#include <asm/io.h>
		#include <asm/setup.h>

		#include <asm/arch/at32ap700x.h>
		#include <asm/arch/board.h>
		#include <asm/arch/init.h>
		#include <asm/arch/portmux.h>
		#include <mach/at32ap700x.h>
		#include <mach/board.h>
		#include <mach/init.h>
		#include <mach/portmux.h>

		/* Oscillator frequencies. These are board-specific */
		unsigned long at32_board_osc_rates[3] = {

+5 −5

Original line number	Diff line number	Diff line
		@@ -23,10 +23,10 @@
		#include <asm/setup.h>
		#include <asm/atmel-mci.h>

		#include <asm/arch/at32ap700x.h>
		#include <asm/arch/board.h>
		#include <asm/arch/init.h>
		#include <asm/arch/portmux.h>
		#include <mach/at32ap700x.h>
		#include <mach/board.h>
		#include <mach/init.h>
		#include <mach/portmux.h>

		#include "atstk1000.h"

		@@ -49,7 +49,7 @@ unsigned long at32_board_osc_rates[3] = {
		*/
		#ifdef CONFIG_BOARD_ATSTK1006
		#include <linux/mtd/partitions.h>
		#include <asm/arch/smc.h>
		#include <mach/smc.h>

		static struct smc_timing nand_timing __initdata = {
		.ncs_read_setup = 0,

+4 −4