diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-29 16:42:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-29 16:42:28 -0400 |
| commit | 55663219378eecd6fccb319be27ce6737a535e4c (patch) | |
| tree | ff20fe50fa2e86ba09677a8b2cc7462ea11347a6 /drivers/macintosh | |
| parent | a43266355b3d8cf6717a27159f9a417bdff73782 (diff) | |
| parent | 58da10bb3fe680a197e83d5eccb5265a721c98e2 (diff) | |
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
* 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc:
[POWERPC] Fix Kconfig warning
[PPC] Fix modpost warning
[POWERPC] Fix modpost warning
[POWERPC] Fix Section mismatch warnings
[POWERPC] QE: fix Kconfig 'select' warning with UCC_FAST
[POWERPC] 52xx: unbreak lite5200 dts (_pic vs. -pic)
[PPC] Remove duplicate export of __div64_32.
[PPC] Fix COMMON symbol warnings
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig index 58926da0ae18..f44c94abd883 100644 --- a/drivers/macintosh/Kconfig +++ b/drivers/macintosh/Kconfig | |||
| @@ -113,7 +113,6 @@ config PMAC_SMU | |||
| 113 | 113 | ||
| 114 | config PMAC_APM_EMU | 114 | config PMAC_APM_EMU |
| 115 | tristate "APM emulation" | 115 | tristate "APM emulation" |
| 116 | select SYS_SUPPORTS_APM_EMULATION | ||
| 117 | select APM_EMULATION | 116 | select APM_EMULATION |
| 118 | depends on ADB_PMU && PM | 117 | depends on ADB_PMU && PM |
| 119 | 118 | ||