diff options
Diffstat (limited to 'fs/partitions/acorn.c')
-rw-r--r-- | fs/partitions/acorn.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/partitions/acorn.c b/fs/partitions/acorn.c index e3491328596b..3d3e16631472 100644 --- a/fs/partitions/acorn.c +++ b/fs/partitions/acorn.c | |||
@@ -25,6 +25,8 @@ | |||
25 | #define PARTITION_RISCIX_SCSI 2 | 25 | #define PARTITION_RISCIX_SCSI 2 |
26 | #define PARTITION_LINUX 9 | 26 | #define PARTITION_LINUX 9 |
27 | 27 | ||
28 | #if defined(CONFIG_ACORN_PARTITION_CUMANA) || \ | ||
29 | defined(CONFIG_ACORN_PARTITION_ADFS) | ||
28 | static struct adfs_discrecord * | 30 | static struct adfs_discrecord * |
29 | adfs_partition(struct parsed_partitions *state, char *name, char *data, | 31 | adfs_partition(struct parsed_partitions *state, char *name, char *data, |
30 | unsigned long first_sector, int slot) | 32 | unsigned long first_sector, int slot) |
@@ -48,6 +50,7 @@ adfs_partition(struct parsed_partitions *state, char *name, char *data, | |||
48 | put_partition(state, slot, first_sector, nr_sects); | 50 | put_partition(state, slot, first_sector, nr_sects); |
49 | return dr; | 51 | return dr; |
50 | } | 52 | } |
53 | #endif | ||
51 | 54 | ||
52 | #ifdef CONFIG_ACORN_PARTITION_RISCIX | 55 | #ifdef CONFIG_ACORN_PARTITION_RISCIX |
53 | 56 | ||
@@ -65,6 +68,8 @@ struct riscix_record { | |||
65 | struct riscix_part part[8]; | 68 | struct riscix_part part[8]; |
66 | }; | 69 | }; |
67 | 70 | ||
71 | #if defined(CONFIG_ACORN_PARTITION_CUMANA) || \ | ||
72 | defined(CONFIG_ACORN_PARTITION_ADFS) | ||
68 | static int | 73 | static int |
69 | riscix_partition(struct parsed_partitions *state, struct block_device *bdev, | 74 | riscix_partition(struct parsed_partitions *state, struct block_device *bdev, |
70 | unsigned long first_sect, int slot, unsigned long nr_sects) | 75 | unsigned long first_sect, int slot, unsigned long nr_sects) |
@@ -105,6 +110,7 @@ riscix_partition(struct parsed_partitions *state, struct block_device *bdev, | |||
105 | return slot; | 110 | return slot; |
106 | } | 111 | } |
107 | #endif | 112 | #endif |
113 | #endif | ||
108 | 114 | ||
109 | #define LINUX_NATIVE_MAGIC 0xdeafa1de | 115 | #define LINUX_NATIVE_MAGIC 0xdeafa1de |
110 | #define LINUX_SWAP_MAGIC 0xdeafab1e | 116 | #define LINUX_SWAP_MAGIC 0xdeafab1e |
@@ -115,6 +121,8 @@ struct linux_part { | |||
115 | __le32 nr_sects; | 121 | __le32 nr_sects; |
116 | }; | 122 | }; |
117 | 123 | ||
124 | #if defined(CONFIG_ACORN_PARTITION_CUMANA) || \ | ||
125 | defined(CONFIG_ACORN_PARTITION_ADFS) | ||
118 | static int | 126 | static int |
119 | linux_partition(struct parsed_partitions *state, struct block_device *bdev, | 127 | linux_partition(struct parsed_partitions *state, struct block_device *bdev, |
120 | unsigned long first_sect, int slot, unsigned long nr_sects) | 128 | unsigned long first_sect, int slot, unsigned long nr_sects) |
@@ -146,6 +154,7 @@ linux_partition(struct parsed_partitions *state, struct block_device *bdev, | |||
146 | put_dev_sector(sect); | 154 | put_dev_sector(sect); |
147 | return slot; | 155 | return slot; |
148 | } | 156 | } |
157 | #endif | ||
149 | 158 | ||
150 | #ifdef CONFIG_ACORN_PARTITION_CUMANA | 159 | #ifdef CONFIG_ACORN_PARTITION_CUMANA |
151 | int | 160 | int |