git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
fs
/
partitions
/
mac.c
diff --git
a/fs/partitions/mac.c
b/fs/partitions/mac.c
index
bb22cdd
..
813292f
100644
(file)
--- a/
fs/partitions/mac.c
+++ b/
fs/partitions/mac.c
@@
-12,6
+12,7
@@
#include "mac.h"
#ifdef CONFIG_PPC_PMAC
#include "mac.h"
#ifdef CONFIG_PPC_PMAC
+#include <asm/machdep.h>
extern void note_bootable_part(dev_t dev, int part, int goodness);
#endif
extern void note_bootable_part(dev_t dev, int part, int goodness);
#endif
@@
-79,7
+80,7
@@
int mac_partition(struct parsed_partitions *state, struct block_device *bdev)
* If this is the first bootable partition, tell the
* setup code, in case it wants to make this the root.
*/
* If this is the first bootable partition, tell the
* setup code, in case it wants to make this the root.
*/
- if (
_machine == _MACH_Pmac
) {
+ if (
machine_is(powermac)
) {
int goodness = 0;
mac_fix_string(part->processor, 16);
int goodness = 0;
mac_fix_string(part->processor, 16);