Commit a1f87dfa authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://linux-ntfs.bkbits.net/ntfs-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 7606ce32 f1efeafd
...@@ -4577,7 +4577,7 @@ __init static void arch_init_sched_domains(void) ...@@ -4577,7 +4577,7 @@ __init static void arch_init_sched_domains(void)
} }
} }
#define SCHED_DOMAIN_DEBUG #undef SCHED_DOMAIN_DEBUG
#ifdef SCHED_DOMAIN_DEBUG #ifdef SCHED_DOMAIN_DEBUG
void sched_domain_debug(void) void sched_domain_debug(void)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment