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

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32 

Pull AVR32 fixes from Hans-Christian Egtvedt.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
  avr32: add generic vga.h to Kbuild
  avr32: add generic ioremap_wc() definition in io.h
  avr32: Makefile: add '-D__linux__' flag for gcc-4.4.7 use
  avr32: fix missing module.h causing build failure in mimc200/fram.c
parents f2a77abd d7668f9d

arch/avr32/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ all: uImage vmlinux.elf 


KBUILD_DEFCONFIG	:= atstk1002_defconfig



KBUILD_CFLAGS	+= -pipe -fno-builtin -mno-pic

KBUILD_CFLAGS	+= -pipe -fno-builtin -mno-pic -D__linux__

KBUILD_AFLAGS	+= -mrelax -mno-pic

KBUILD_CFLAGS_MODULE += -mno-relax

LDFLAGS_vmlinux	+= --relax

arch/avr32/boards/mimc200/fram.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#define FRAM_VERSION	"1.0"



#include <linux/miscdevice.h>

#include <linux/module.h>

#include <linux/proc_fs.h>

#include <linux/mm.h>

#include <linux/io.h>

arch/avr32/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -17,5 +17,6 @@ generic-y += scatterlist.h 
generic-y       += sections.h

generic-y       += topology.h

generic-y	+= trace_clock.h

generic-y += vga.h

generic-y       += xor.h

generic-y	+= hash.h

arch/avr32/include/asm/io.h

+2 −0
Original line number Diff line number Diff line
@@ -295,6 +295,8 @@ extern void __iounmap(void __iomem *addr); 
#define iounmap(addr)				\

	__iounmap(addr)



#define ioremap_wc ioremap_nocache



#define cached(addr) P1SEGADDR(addr)

#define uncached(addr) P2SEGADDR(addr)