---

yaml --- r: 280289 b: refs/heads/master c: 9be96f3 h: refs/heads/master i: 280287: caf8350 v: v3
git-mirror · Jan 4, 2012 · 3e061fc · 3e061fc
1 parent 699a040
commit 3e061fc
Show file tree

Hide file tree

Showing 37 changed files with 9 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4752bc309b7604d507c973c7b7678ac2ce10a058
+refs/heads/master: 9be96f3fd10187f185d84cf878cf032465bcced3
diff --git a/trunk/block/Kconfig b/trunk/block/Kconfig
@@ -99,6 +99,12 @@ config BLK_DEV_THROTTLING
 
 	See Documentation/cgroups/blkio-controller.txt for more information.
 
+menu "Partition Types"
+
+source "block/partitions/Kconfig"
+
+endmenu
+
 endif # BLOCK
 
 config BLOCK_COMPAT

diff --git a/trunk/block/Makefile b/trunk/block/Makefile
@@ -5,7 +5,8 @@
 obj-$(CONFIG_BLOCK) := elevator.o blk-core.o blk-tag.o blk-sysfs.o \
 			blk-flush.o blk-settings.o blk-ioc.o blk-map.o \
 			blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \
-			blk-iopoll.o blk-lib.o ioctl.o genhd.o scsi_ioctl.o
+			blk-iopoll.o blk-lib.o ioctl.o genhd.o scsi_ioctl.o \
+			partitions/
 
 obj-$(CONFIG_BLK_DEV_BSG)	+= bsg.o
 obj-$(CONFIG_BLK_DEV_BSGLIB)	+= bsg-lib.o

diff --git a/trunk/fs/partitions/Kconfig → trunk/block/partitions/Kconfig b/trunk/fs/partitions/Kconfig → trunk/block/partitions/Kconfig
diff --git a/trunk/fs/partitions/Makefile → trunk/block/partitions/Makefile b/trunk/fs/partitions/Makefile → trunk/block/partitions/Makefile
diff --git a/trunk/fs/partitions/acorn.c → trunk/block/partitions/acorn.c b/trunk/fs/partitions/acorn.c → trunk/block/partitions/acorn.c
diff --git a/trunk/fs/partitions/acorn.h → trunk/block/partitions/acorn.h b/trunk/fs/partitions/acorn.h → trunk/block/partitions/acorn.h
diff --git a/trunk/fs/partitions/amiga.c → trunk/block/partitions/amiga.c b/trunk/fs/partitions/amiga.c → trunk/block/partitions/amiga.c
diff --git a/trunk/fs/partitions/amiga.h → trunk/block/partitions/amiga.h b/trunk/fs/partitions/amiga.h → trunk/block/partitions/amiga.h
diff --git a/trunk/fs/partitions/atari.c → trunk/block/partitions/atari.c b/trunk/fs/partitions/atari.c → trunk/block/partitions/atari.c
diff --git a/trunk/fs/partitions/atari.h → trunk/block/partitions/atari.h b/trunk/fs/partitions/atari.h → trunk/block/partitions/atari.h
diff --git a/trunk/fs/partitions/check.c → trunk/block/partitions/check.c b/trunk/fs/partitions/check.c → trunk/block/partitions/check.c
diff --git a/trunk/fs/partitions/check.h → trunk/block/partitions/check.h b/trunk/fs/partitions/check.h → trunk/block/partitions/check.h
diff --git a/trunk/fs/partitions/efi.c → trunk/block/partitions/efi.c b/trunk/fs/partitions/efi.c → trunk/block/partitions/efi.c
diff --git a/trunk/fs/partitions/efi.h → trunk/block/partitions/efi.h b/trunk/fs/partitions/efi.h → trunk/block/partitions/efi.h
diff --git a/trunk/fs/partitions/ibm.c → trunk/block/partitions/ibm.c b/trunk/fs/partitions/ibm.c → trunk/block/partitions/ibm.c
diff --git a/trunk/fs/partitions/ibm.h → trunk/block/partitions/ibm.h b/trunk/fs/partitions/ibm.h → trunk/block/partitions/ibm.h
diff --git a/trunk/fs/partitions/karma.c → trunk/block/partitions/karma.c b/trunk/fs/partitions/karma.c → trunk/block/partitions/karma.c
diff --git a/trunk/fs/partitions/karma.h → trunk/block/partitions/karma.h b/trunk/fs/partitions/karma.h → trunk/block/partitions/karma.h
diff --git a/trunk/fs/partitions/ldm.c → trunk/block/partitions/ldm.c b/trunk/fs/partitions/ldm.c → trunk/block/partitions/ldm.c
diff --git a/trunk/fs/partitions/ldm.h → trunk/block/partitions/ldm.h b/trunk/fs/partitions/ldm.h → trunk/block/partitions/ldm.h
diff --git a/trunk/fs/partitions/mac.c → trunk/block/partitions/mac.c b/trunk/fs/partitions/mac.c → trunk/block/partitions/mac.c
diff --git a/trunk/fs/partitions/mac.h → trunk/block/partitions/mac.h b/trunk/fs/partitions/mac.h → trunk/block/partitions/mac.h
diff --git a/trunk/fs/partitions/msdos.c → trunk/block/partitions/msdos.c b/trunk/fs/partitions/msdos.c → trunk/block/partitions/msdos.c
diff --git a/trunk/fs/partitions/msdos.h → trunk/block/partitions/msdos.h b/trunk/fs/partitions/msdos.h → trunk/block/partitions/msdos.h
diff --git a/trunk/fs/partitions/osf.c → trunk/block/partitions/osf.c b/trunk/fs/partitions/osf.c → trunk/block/partitions/osf.c
diff --git a/trunk/fs/partitions/osf.h → trunk/block/partitions/osf.h b/trunk/fs/partitions/osf.h → trunk/block/partitions/osf.h
diff --git a/trunk/fs/partitions/sgi.c → trunk/block/partitions/sgi.c b/trunk/fs/partitions/sgi.c → trunk/block/partitions/sgi.c
diff --git a/trunk/fs/partitions/sgi.h → trunk/block/partitions/sgi.h b/trunk/fs/partitions/sgi.h → trunk/block/partitions/sgi.h
diff --git a/trunk/fs/partitions/sun.c → trunk/block/partitions/sun.c b/trunk/fs/partitions/sun.c → trunk/block/partitions/sun.c
diff --git a/trunk/fs/partitions/sun.h → trunk/block/partitions/sun.h b/trunk/fs/partitions/sun.h → trunk/block/partitions/sun.h
diff --git a/trunk/fs/partitions/sysv68.c → trunk/block/partitions/sysv68.c b/trunk/fs/partitions/sysv68.c → trunk/block/partitions/sysv68.c
diff --git a/trunk/fs/partitions/sysv68.h → trunk/block/partitions/sysv68.h b/trunk/fs/partitions/sysv68.h → trunk/block/partitions/sysv68.h
diff --git a/trunk/fs/partitions/ultrix.c → trunk/block/partitions/ultrix.c b/trunk/fs/partitions/ultrix.c → trunk/block/partitions/ultrix.c
diff --git a/trunk/fs/partitions/ultrix.h → trunk/block/partitions/ultrix.h b/trunk/fs/partitions/ultrix.h → trunk/block/partitions/ultrix.h
diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig
@@ -266,14 +266,6 @@ source "fs/9p/Kconfig"
 
 endif # NETWORK_FILESYSTEMS
 
-if BLOCK
-menu "Partition Types"
-
-source "fs/partitions/Kconfig"
-
-endmenu
-endif
-
 source "fs/nls/Kconfig"
 source "fs/dlm/Kconfig"
 

diff --git a/trunk/fs/Makefile b/trunk/fs/Makefile
@@ -52,7 +52,6 @@ obj-$(CONFIG_FHANDLE)		+= fhandle.o
 obj-y				+= quota/
 
 obj-$(CONFIG_PROC_FS)		+= proc/
-obj-y				+= partitions/
 obj-$(CONFIG_SYSFS)		+= sysfs/
 obj-$(CONFIG_CONFIGFS_FS)	+= configfs/
 obj-y				+= devpts/