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
This commit is contained in:
commit
2b250395c2
|
@ -11,7 +11,7 @@ all: uImage vmlinux.elf
|
||||||
|
|
||||||
KBUILD_DEFCONFIG := atstk1002_defconfig
|
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_AFLAGS += -mrelax -mno-pic
|
||||||
KBUILD_CFLAGS_MODULE += -mno-relax
|
KBUILD_CFLAGS_MODULE += -mno-relax
|
||||||
LDFLAGS_vmlinux += --relax
|
LDFLAGS_vmlinux += --relax
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
#define FRAM_VERSION "1.0"
|
#define FRAM_VERSION "1.0"
|
||||||
|
|
||||||
#include <linux/miscdevice.h>
|
#include <linux/miscdevice.h>
|
||||||
|
#include <linux/module.h>
|
||||||
#include <linux/proc_fs.h>
|
#include <linux/proc_fs.h>
|
||||||
#include <linux/mm.h>
|
#include <linux/mm.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
|
|
|
@ -17,5 +17,6 @@ generic-y += scatterlist.h
|
||||||
generic-y += sections.h
|
generic-y += sections.h
|
||||||
generic-y += topology.h
|
generic-y += topology.h
|
||||||
generic-y += trace_clock.h
|
generic-y += trace_clock.h
|
||||||
|
generic-y += vga.h
|
||||||
generic-y += xor.h
|
generic-y += xor.h
|
||||||
generic-y += hash.h
|
generic-y += hash.h
|
||||||
|
|
|
@ -295,6 +295,8 @@ extern void __iounmap(void __iomem *addr);
|
||||||
#define iounmap(addr) \
|
#define iounmap(addr) \
|
||||||
__iounmap(addr)
|
__iounmap(addr)
|
||||||
|
|
||||||
|
#define ioremap_wc ioremap_nocache
|
||||||
|
|
||||||
#define cached(addr) P1SEGADDR(addr)
|
#define cached(addr) P1SEGADDR(addr)
|
||||||
#define uncached(addr) P2SEGADDR(addr)
|
#define uncached(addr) P2SEGADDR(addr)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue