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/arm/mach-ep93xx | |
| 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/arm/mach-ep93xx')
| -rw-r--r-- | arch/arm/mach-ep93xx/micro9.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c index f3757a1c5a10..c33360e82868 100644 --- a/arch/arm/mach-ep93xx/micro9.c +++ b/arch/arm/mach-ep93xx/micro9.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | * | 28 | * |
| 29 | * Micro9-High has up to 64MB of 32-bit flash on CS1 | 29 | * Micro9-High has up to 64MB of 32-bit flash on CS1 |
| 30 | * Micro9-Mid has up to 64MB of either 32-bit or 16-bit flash on CS1 | 30 | * Micro9-Mid has up to 64MB of either 32-bit or 16-bit flash on CS1 |
| 31 | * Micro9-Lite uses a seperate MTD map driver for flash support | 31 | * Micro9-Lite uses a separate MTD map driver for flash support |
| 32 | * Micro9-Slim has up to 64MB of either 32-bit or 16-bit flash on CS1 | 32 | * Micro9-Slim has up to 64MB of either 32-bit or 16-bit flash on CS1 |
| 33 | *************************************************************************/ | 33 | *************************************************************************/ |
| 34 | static struct physmap_flash_data micro9_flash_data; | 34 | static struct physmap_flash_data micro9_flash_data; |