diff options
author | Steve French <sfrench@us.ibm.com> | 2008-04-24 17:26:50 +0200 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-04-24 17:26:50 +0200 |
commit | 36d99df2fb474222ab47fbe8ae7385661033223b (patch) | |
tree | 962e068491b752a944f61c454fad3f8619a1ea3f /arch/x86/mach-generic/default.c | |
parent | [CIFS] Fix UNC path prefix on QueryUnixPathInfo to have correct slash (diff) | |
parent | slab_err: Pass parameters correctly to slab_bug (diff) | |
download | linux-36d99df2fb474222ab47fbe8ae7385661033223b.tar.xz linux-36d99df2fb474222ab47fbe8ae7385661033223b.zip |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/x86/mach-generic/default.c')
-rw-r--r-- | arch/x86/mach-generic/default.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c index 1af0cc7648f0..9e835a11a13a 100644 --- a/arch/x86/mach-generic/default.c +++ b/arch/x86/mach-generic/default.c @@ -1,4 +1,4 @@ -/* +/* * Default generic APIC driver. This handles up to 8 CPUs. */ #define APIC_DEFINITION 1 @@ -19,8 +19,8 @@ /* should be called last. */ static int probe_default(void) -{ +{ return 1; -} +} -struct genapic apic_default = APIC_INIT("default", probe_default); +struct genapic apic_default = APIC_INIT("default", probe_default); |