summaryrefslogtreecommitdiffstats
path: root/fs/partitions/check.c
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2006-01-18 09:14:51 +0000
committerSteven Whitehouse <swhiteho@redhat.com>2006-01-18 09:14:51 +0000
commit2ff4782374dde5e3d76daf8a82eae396c0f76567 (patch)
tree42cc821174a3f3f410895fce16741948a1103e66 /fs/partitions/check.c
parentcd1344fe322cd9d95b2c0f011d6766677cfcb29b (diff)
parent7eb9b2f56c9812d03ac63031869bcc42151067b1 (diff)
downloadblackbird-op-linux-2ff4782374dde5e3d76daf8a82eae396c0f76567.tar.gz
blackbird-op-linux-2ff4782374dde5e3d76daf8a82eae396c0f76567.zip
Merge branch 'master'
Diffstat (limited to 'fs/partitions/check.c')
-rw-r--r--fs/partitions/check.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 7881ce05daef..f924f459bdb8 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -35,6 +35,7 @@
#include "ibm.h"
#include "ultrix.h"
#include "efi.h"
+#include "karma.h"
#ifdef CONFIG_BLK_DEV_MD
extern void md_autodetect_dev(dev_t dev);
@@ -103,6 +104,9 @@ static int (*check_part[])(struct parsed_partitions *, struct block_device *) =
#ifdef CONFIG_IBM_PARTITION
ibm_partition,
#endif
+#ifdef CONFIG_KARMA_PARTITION
+ karma_partition,
+#endif
NULL
};
OpenPOWER on IntegriCloud