diff options
| author | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 23:24:23 +0200 |
|---|---|---|
| committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 23:24:23 +0200 |
| commit | 05668381140309088443bf5dc53add4104610fbb (patch) | |
| tree | ed53039717390e1a71ff16209281b1f1c8d3e6be /arch/i386/mm/discontig.c | |
| parent | 34c162f79e374556dd1384437f0dab558b5dc657 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
| download | kernel_samsung_smdk4412-05668381140309088443bf5dc53add4104610fbb.zip kernel_samsung_smdk4412-05668381140309088443bf5dc53add4104610fbb.tar.gz kernel_samsung_smdk4412-05668381140309088443bf5dc53add4104610fbb.tar.bz2 | |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'arch/i386/mm/discontig.c')
| -rw-r--r-- | arch/i386/mm/discontig.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/i386/mm/discontig.c b/arch/i386/mm/discontig.c index fe6eb90..7c392dc 100644 --- a/arch/i386/mm/discontig.c +++ b/arch/i386/mm/discontig.c @@ -22,7 +22,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <linux/config.h> #include <linux/mm.h> #include <linux/bootmem.h> #include <linux/mmzone.h> @@ -43,7 +42,7 @@ EXPORT_SYMBOL(node_data); bootmem_data_t node0_bdata; /* - * numa interface - we expect the numa architecture specfic code to have + * numa interface - we expect the numa architecture specific code to have * populated the following initialisation. * * 1) node_online_map - the map of all nodes configured (online) in the system |