Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 472e374161bc00d392e1755fe9915f42b11e310f

Authored by Linus Torvalds
2 parents 463b21fb27 4dc5aa2172
Exists in master and in 13 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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

Showing 7 changed files Side-by-side Diff

arch/m68k/configs/m5208evb_defconfig
Diff comments   View file @ 472e374
... ... @@ -40,7 +40,6 @@
40 40 # CONFIG_IPV6 is not set
41 41 # CONFIG_FW_LOADER is not set
42 42 CONFIG_MTD=y
43   -CONFIG_MTD_PARTITIONS=y
44 43 CONFIG_MTD_CHAR=y
45 44 CONFIG_MTD_BLOCK=y
46 45 CONFIG_MTD_RAM=y
arch/m68k/configs/m5249evb_defconfig
Diff comments   View file @ 472e374
... ... @@ -38,7 +38,6 @@
38 38 # CONFIG_IPV6 is not set
39 39 # CONFIG_FW_LOADER is not set
40 40 CONFIG_MTD=y
41   -CONFIG_MTD_PARTITIONS=y
42 41 CONFIG_MTD_CHAR=y
43 42 CONFIG_MTD_BLOCK=y
44 43 CONFIG_MTD_RAM=y
arch/m68k/configs/m5272c3_defconfig
Diff comments   View file @ 472e374
... ... @@ -36,7 +36,6 @@
36 36 # CONFIG_IPV6 is not set
37 37 # CONFIG_FW_LOADER is not set
38 38 CONFIG_MTD=y
39   -CONFIG_MTD_PARTITIONS=y
40 39 CONFIG_MTD_CHAR=y
41 40 CONFIG_MTD_BLOCK=y
42 41 CONFIG_MTD_RAM=y
arch/m68k/configs/m5275evb_defconfig
Diff comments   View file @ 472e374
... ... @@ -39,7 +39,6 @@
39 39 # CONFIG_IPV6 is not set
40 40 # CONFIG_FW_LOADER is not set
41 41 CONFIG_MTD=y
42   -CONFIG_MTD_PARTITIONS=y
43 42 CONFIG_MTD_CHAR=y
44 43 CONFIG_MTD_BLOCK=y
45 44 CONFIG_MTD_RAM=y
arch/m68k/configs/m5307c3_defconfig
Diff comments   View file @ 472e374
... ... @@ -38,7 +38,6 @@
38 38 # CONFIG_IPV6 is not set
39 39 # CONFIG_FW_LOADER is not set
40 40 CONFIG_MTD=y
41   -CONFIG_MTD_PARTITIONS=y
42 41 CONFIG_MTD_CHAR=y
43 42 CONFIG_MTD_BLOCK=y
44 43 CONFIG_MTD_RAM=y
arch/m68k/configs/m5407c3_defconfig
Diff comments   View file @ 472e374
... ... @@ -38,7 +38,6 @@
38 38 # CONFIG_IPV6 is not set
39 39 # CONFIG_FW_LOADER is not set
40 40 CONFIG_MTD=y
41   -CONFIG_MTD_PARTITIONS=y
42 41 CONFIG_MTD_CHAR=y
43 42 CONFIG_MTD_BLOCK=y
44 43 CONFIG_MTD_RAM=y
arch/m68k/include/asm/io_no.h
Diff comments   View file @ 472e374
... ... @@ -55,7 +55,7 @@
55 55 #define __raw_writew writew
56 56 #define __raw_writel writel
57 57  
58   -static inline void io_outsb(unsigned int addr, void *buf, int len)
  58 +static inline void io_outsb(unsigned int addr, const void *buf, int len)
59 59 {
60 60 volatile unsigned char *ap = (volatile unsigned char *) addr;
61 61 unsigned char *bp = (unsigned char *) buf;
... ... @@ -63,7 +63,7 @@
63 63 *ap = *bp++;
64 64 }
65 65  
66   -static inline void io_outsw(unsigned int addr, void *buf, int len)
  66 +static inline void io_outsw(unsigned int addr, const void *buf, int len)
67 67 {
68 68 volatile unsigned short *ap = (volatile unsigned short *) addr;
69 69 unsigned short *bp = (unsigned short *) buf;
... ... @@ -71,7 +71,7 @@
71 71 *ap = _swapw(*bp++);
72 72 }
73 73  
74   -static inline void io_outsl(unsigned int addr, void *buf, int len)
  74 +static inline void io_outsl(unsigned int addr, const void *buf, int len)
75 75 {
76 76 volatile unsigned int *ap = (volatile unsigned int *) addr;
77 77 unsigned int *bp = (unsigned int *) buf;