diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
tree | ce595adde342f57f379d277b25e4dd206988a052 /arch/m68k/include/asm | |
parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'arch/m68k/include/asm')
-rw-r--r-- | arch/m68k/include/asm/fbio.h | 2 | ||||
-rw-r--r-- | arch/m68k/include/asm/io_no.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/fbio.h b/arch/m68k/include/asm/fbio.h index b9215a0907d3..0a21da87f7d6 100644 --- a/arch/m68k/include/asm/fbio.h +++ b/arch/m68k/include/asm/fbio.h | |||
@@ -173,7 +173,7 @@ struct mdi_cfginfo { | |||
173 | int mdi_ncluts; /* Number of implemented CLUTs in this MDI */ | 173 | int mdi_ncluts; /* Number of implemented CLUTs in this MDI */ |
174 | int mdi_type; /* FBTYPE name */ | 174 | int mdi_type; /* FBTYPE name */ |
175 | int mdi_height; /* height */ | 175 | int mdi_height; /* height */ |
176 | int mdi_width; /* widht */ | 176 | int mdi_width; /* width */ |
177 | int mdi_size; /* available ram */ | 177 | int mdi_size; /* available ram */ |
178 | int mdi_mode; /* 8bpp, 16bpp or 32bpp */ | 178 | int mdi_mode; /* 8bpp, 16bpp or 32bpp */ |
179 | int mdi_pixfreq; /* pixel clock (from PROM) */ | 179 | int mdi_pixfreq; /* pixel clock (from PROM) */ |
diff --git a/arch/m68k/include/asm/io_no.h b/arch/m68k/include/asm/io_no.h index 359065d5a9f2..6e2413e518cb 100644 --- a/arch/m68k/include/asm/io_no.h +++ b/arch/m68k/include/asm/io_no.h | |||
@@ -16,7 +16,7 @@ | |||
16 | * memory location directly. | 16 | * memory location directly. |
17 | */ | 17 | */ |
18 | /* ++roman: The assignments to temp. vars avoid that gcc sometimes generates | 18 | /* ++roman: The assignments to temp. vars avoid that gcc sometimes generates |
19 | * two accesses to memory, which may be undesireable for some devices. | 19 | * two accesses to memory, which may be undesirable for some devices. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | /* | 22 | /* |