diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /include/asm-generic/vmlinux.lds.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'include/asm-generic/vmlinux.lds.h')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 32c45e5fe0ab..bd297a20ab98 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -773,7 +773,7 @@ | |||
| 773 | * the sections that has this restriction (or similar) | 773 | * the sections that has this restriction (or similar) |
| 774 | * is located before the ones requiring PAGE_SIZE alignment. | 774 | * is located before the ones requiring PAGE_SIZE alignment. |
| 775 | * NOSAVE_DATA starts and ends with a PAGE_SIZE alignment which | 775 | * NOSAVE_DATA starts and ends with a PAGE_SIZE alignment which |
| 776 | * matches the requirment of PAGE_ALIGNED_DATA. | 776 | * matches the requirement of PAGE_ALIGNED_DATA. |
| 777 | * | 777 | * |
| 778 | * use 0 as page_align if page_aligned data is not used */ | 778 | * use 0 as page_align if page_aligned data is not used */ |
| 779 | #define RW_DATA_SECTION(cacheline, pagealigned, inittask) \ | 779 | #define RW_DATA_SECTION(cacheline, pagealigned, inittask) \ |