hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68k fixes from Greg Ungerer:
 "Just a couple of fixes.  Clean up compile warnings by using correct
  types in function args, and clean out the removed CONFIG_MTD_PARTITIONS"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: fix arg types for outs* functions
  m68k : Kill CONFIG_MTD_PARTITIONS
This commit is contained in:
Linus Torvalds 2014-04-05 13:18:52 -07:00
parent 463b21fb27 4dc5aa2172
commit 472e374161
7 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/m68k/configs/m5208evb_defconfig
View File

@ -40,7 +40,6 @@ CONFIG_INET=y
# CONFIG_IPV6 is not set # CONFIG_IPV6 is not set
# CONFIG_FW_LOADER is not set # CONFIG_FW_LOADER is not set
CONFIG_MTD=y CONFIG_MTD=y
CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_CHAR=y CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y CONFIG_MTD_BLOCK=y
CONFIG_MTD_RAM=y CONFIG_MTD_RAM=y

1
arch/m68k/configs/m5249evb_defconfig
View File

@ -38,7 +38,6 @@ CONFIG_INET=y
# CONFIG_IPV6 is not set # CONFIG_IPV6 is not set
# CONFIG_FW_LOADER is not set # CONFIG_FW_LOADER is not set
CONFIG_MTD=y CONFIG_MTD=y
CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_CHAR=y CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y CONFIG_MTD_BLOCK=y
CONFIG_MTD_RAM=y CONFIG_MTD_RAM=y

1
arch/m68k/configs/m5272c3_defconfig
View File

@ -36,7 +36,6 @@ CONFIG_INET=y
# CONFIG_IPV6 is not set # CONFIG_IPV6 is not set
# CONFIG_FW_LOADER is not set # CONFIG_FW_LOADER is not set
CONFIG_MTD=y CONFIG_MTD=y
CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_CHAR=y CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y CONFIG_MTD_BLOCK=y
CONFIG_MTD_RAM=y CONFIG_MTD_RAM=y

1
arch/m68k/configs/m5275evb_defconfig
View File

@ -39,7 +39,6 @@ CONFIG_INET=y
# CONFIG_IPV6 is not set # CONFIG_IPV6 is not set
# CONFIG_FW_LOADER is not set # CONFIG_FW_LOADER is not set
CONFIG_MTD=y CONFIG_MTD=y
CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_CHAR=y CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y CONFIG_MTD_BLOCK=y
CONFIG_MTD_RAM=y CONFIG_MTD_RAM=y

1
arch/m68k/configs/m5307c3_defconfig
View File

@ -38,7 +38,6 @@ CONFIG_INET=y
# CONFIG_IPV6 is not set # CONFIG_IPV6 is not set
# CONFIG_FW_LOADER is not set # CONFIG_FW_LOADER is not set
CONFIG_MTD=y CONFIG_MTD=y
CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_CHAR=y CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y CONFIG_MTD_BLOCK=y
CONFIG_MTD_RAM=y CONFIG_MTD_RAM=y

1
arch/m68k/configs/m5407c3_defconfig
View File

@ -38,7 +38,6 @@ CONFIG_INET=y
# CONFIG_IPV6 is not set # CONFIG_IPV6 is not set
# CONFIG_FW_LOADER is not set # CONFIG_FW_LOADER is not set
CONFIG_MTD=y CONFIG_MTD=y
CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_CHAR=y CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y CONFIG_MTD_BLOCK=y
CONFIG_MTD_RAM=y CONFIG_MTD_RAM=y

6
arch/m68k/include/asm/io_no.h
View File

@ -55,7 +55,7 @@ static inline unsigned int _swapl(volatile unsigned long v)
#define __raw_writew writew #define __raw_writew writew
#define __raw_writel writel #define __raw_writel writel
static inline void io_outsb(unsigned int addr, void *buf, int len) static inline void io_outsb(unsigned int addr, const void *buf, int len)
{ {
volatile unsigned char *ap = (volatile unsigned char *) addr; volatile unsigned char *ap = (volatile unsigned char *) addr;
unsigned char *bp = (unsigned char *) buf; unsigned char *bp = (unsigned char *) buf;
@ -63,7 +63,7 @@ static inline void io_outsb(unsigned int addr, void *buf, int len)
*ap = *bp++; *ap = *bp++;
} }
static inline void io_outsw(unsigned int addr, void *buf, int len) static inline void io_outsw(unsigned int addr, const void *buf, int len)
{ {
volatile unsigned short *ap = (volatile unsigned short *) addr; volatile unsigned short *ap = (volatile unsigned short *) addr;
unsigned short *bp = (unsigned short *) buf; unsigned short *bp = (unsigned short *) buf;
@ -71,7 +71,7 @@ static inline void io_outsw(unsigned int addr, void *buf, int len)
*ap = _swapw(*bp++); *ap = _swapw(*bp++);
} }
static inline void io_outsl(unsigned int addr, void *buf, int len) static inline void io_outsl(unsigned int addr, const void *buf, int len)
{ {
volatile unsigned int *ap = (volatile unsigned int *) addr; volatile unsigned int *ap = (volatile unsigned int *) addr;
unsigned int *bp = (unsigned int *) buf; unsigned int *bp = (unsigned int *) buf;