Commit d05e96fe authored by Denver Gingerich's avatar Denver Gingerich Committed by Linus Torvalds

fix compiler warnings in acorn.c

warning: 'adfs_partition' defined but not used
warning: 'riscix_partition' defined but not used
warning: 'linux_partition' defined but not used
Signed-off-by: default avatarDenver Gingerich <denver@ossguy.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 21eb9202
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#define PARTITION_RISCIX_SCSI 2 #define PARTITION_RISCIX_SCSI 2
#define PARTITION_LINUX 9 #define PARTITION_LINUX 9
#if defined(CONFIG_ACORN_PARTITION_CUMANA) || \
defined(CONFIG_ACORN_PARTITION_ADFS)
static struct adfs_discrecord * static struct adfs_discrecord *
adfs_partition(struct parsed_partitions *state, char *name, char *data, adfs_partition(struct parsed_partitions *state, char *name, char *data,
unsigned long first_sector, int slot) unsigned long first_sector, int slot)
...@@ -48,6 +50,7 @@ adfs_partition(struct parsed_partitions *state, char *name, char *data, ...@@ -48,6 +50,7 @@ adfs_partition(struct parsed_partitions *state, char *name, char *data,
put_partition(state, slot, first_sector, nr_sects); put_partition(state, slot, first_sector, nr_sects);
return dr; return dr;
} }
#endif
#ifdef CONFIG_ACORN_PARTITION_RISCIX #ifdef CONFIG_ACORN_PARTITION_RISCIX
...@@ -65,6 +68,8 @@ struct riscix_record { ...@@ -65,6 +68,8 @@ struct riscix_record {
struct riscix_part part[8]; struct riscix_part part[8];
}; };
#if defined(CONFIG_ACORN_PARTITION_CUMANA) || \
defined(CONFIG_ACORN_PARTITION_ADFS)
static int static int
riscix_partition(struct parsed_partitions *state, struct block_device *bdev, riscix_partition(struct parsed_partitions *state, struct block_device *bdev,
unsigned long first_sect, int slot, unsigned long nr_sects) 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,6 +110,7 @@ riscix_partition(struct parsed_partitions *state, struct block_device *bdev,
return slot; return slot;
} }
#endif #endif
#endif
#define LINUX_NATIVE_MAGIC 0xdeafa1de #define LINUX_NATIVE_MAGIC 0xdeafa1de
#define LINUX_SWAP_MAGIC 0xdeafab1e #define LINUX_SWAP_MAGIC 0xdeafab1e
...@@ -115,6 +121,8 @@ struct linux_part { ...@@ -115,6 +121,8 @@ struct linux_part {
__le32 nr_sects; __le32 nr_sects;
}; };
#if defined(CONFIG_ACORN_PARTITION_CUMANA) || \
defined(CONFIG_ACORN_PARTITION_ADFS)
static int static int
linux_partition(struct parsed_partitions *state, struct block_device *bdev, linux_partition(struct parsed_partitions *state, struct block_device *bdev,
unsigned long first_sect, int slot, unsigned long nr_sects) 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,6 +154,7 @@ linux_partition(struct parsed_partitions *state, struct block_device *bdev,
put_dev_sector(sect); put_dev_sector(sect);
return slot; return slot;
} }
#endif
#ifdef CONFIG_ACORN_PARTITION_CUMANA #ifdef CONFIG_ACORN_PARTITION_CUMANA
int int
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment