diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-26 08:04:21 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-26 08:04:21 +0200 |
| commit | 14cf11af6cf608eb8c23e989ddb17a715ddce109 (patch) | |
| tree | 271a97ce73e265f39c569cb159c195c5b4bb3f8c /drivers | |
| parent | Merge from Linus' tree. (diff) | |
| download | linux-14cf11af6cf608eb8c23e989ddb17a715ddce109.tar.xz linux-14cf11af6cf608eb8c23e989ddb17a715ddce109.zip | |
powerpc: Merge enough to start building in arch/powerpc.
This creates the directory structure under arch/powerpc and a bunch
of Kconfig files. It does a first-cut merge of arch/powerpc/mm,
arch/powerpc/lib and arch/powerpc/platforms/powermac. This is enough
to build a 32-bit powermac kernel with ARCH=powerpc.
For now we are getting some unmerged files from arch/ppc/kernel and
arch/ppc/syslib, or arch/ppc64/kernel. This makes some minor changes
to files in those directories and files outside arch/powerpc.
The boot directory is still not merged. That's going to be interesting.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/macintosh/via-pmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index 76719451e384..503461884528 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c @@ -405,7 +405,7 @@ static int __init via_pmu_start(void) bright_req_2.complete = 1; batt_req.complete = 1; -#ifdef CONFIG_PPC32 +#if defined(CONFIG_PPC32) && !defined(CONFIG_PPC_MERGE) if (pmu_kind == PMU_KEYLARGO_BASED) openpic_set_irq_priority(vias->intrs[0].line, OPENPIC_PRIORITY_DEFAULT + 1); |