diff options
| -rw-r--r-- | block/Kconfig | 6 | ||||
| -rw-r--r-- | block/Makefile | 3 | ||||
| -rw-r--r-- | block/partitions/Kconfig (renamed from fs/partitions/Kconfig) | 0 | ||||
| -rw-r--r-- | block/partitions/Makefile (renamed from fs/partitions/Makefile) | 0 | ||||
| -rw-r--r-- | block/partitions/acorn.c (renamed from fs/partitions/acorn.c) | 0 | ||||
| -rw-r--r-- | block/partitions/acorn.h (renamed from fs/partitions/acorn.h) | 0 | ||||
| -rw-r--r-- | block/partitions/amiga.c (renamed from fs/partitions/amiga.c) | 0 | ||||
| -rw-r--r-- | block/partitions/amiga.h (renamed from fs/partitions/amiga.h) | 0 | ||||
| -rw-r--r-- | block/partitions/atari.c (renamed from fs/partitions/atari.c) | 0 | ||||
| -rw-r--r-- | block/partitions/atari.h (renamed from fs/partitions/atari.h) | 0 | ||||
| -rw-r--r-- | block/partitions/check.c (renamed from fs/partitions/check.c) | 0 | ||||
| -rw-r--r-- | block/partitions/check.h (renamed from fs/partitions/check.h) | 0 | ||||
| -rw-r--r-- | block/partitions/efi.c (renamed from fs/partitions/efi.c) | 0 | ||||
| -rw-r--r-- | block/partitions/efi.h (renamed from fs/partitions/efi.h) | 0 | ||||
| -rw-r--r-- | block/partitions/ibm.c (renamed from fs/partitions/ibm.c) | 0 | ||||
| -rw-r--r-- | block/partitions/ibm.h (renamed from fs/partitions/ibm.h) | 0 | ||||
| -rw-r--r-- | block/partitions/karma.c (renamed from fs/partitions/karma.c) | 0 | ||||
| -rw-r--r-- | block/partitions/karma.h (renamed from fs/partitions/karma.h) | 0 | ||||
| -rw-r--r-- | block/partitions/ldm.c (renamed from fs/partitions/ldm.c) | 0 | ||||
| -rw-r--r-- | block/partitions/ldm.h (renamed from fs/partitions/ldm.h) | 0 | ||||
| -rw-r--r-- | block/partitions/mac.c (renamed from fs/partitions/mac.c) | 0 | ||||
| -rw-r--r-- | block/partitions/mac.h (renamed from fs/partitions/mac.h) | 0 | ||||
| -rw-r--r-- | block/partitions/msdos.c (renamed from fs/partitions/msdos.c) | 0 | ||||
| -rw-r--r-- | block/partitions/msdos.h (renamed from fs/partitions/msdos.h) | 0 | ||||
| -rw-r--r-- | block/partitions/osf.c (renamed from fs/partitions/osf.c) | 0 | ||||
| -rw-r--r-- | block/partitions/osf.h (renamed from fs/partitions/osf.h) | 0 | ||||
| -rw-r--r-- | block/partitions/sgi.c (renamed from fs/partitions/sgi.c) | 0 | ||||
| -rw-r--r-- | block/partitions/sgi.h (renamed from fs/partitions/sgi.h) | 0 | ||||
| -rw-r--r-- | block/partitions/sun.c (renamed from fs/partitions/sun.c) | 0 | ||||
| -rw-r--r-- | block/partitions/sun.h (renamed from fs/partitions/sun.h) | 0 | ||||
| -rw-r--r-- | block/partitions/sysv68.c (renamed from fs/partitions/sysv68.c) | 0 | ||||
| -rw-r--r-- | block/partitions/sysv68.h (renamed from fs/partitions/sysv68.h) | 0 | ||||
| -rw-r--r-- | block/partitions/ultrix.c (renamed from fs/partitions/ultrix.c) | 0 | ||||
| -rw-r--r-- | block/partitions/ultrix.h (renamed from fs/partitions/ultrix.h) | 0 | ||||
| -rw-r--r-- | fs/Kconfig | 8 | ||||
| -rw-r--r-- | fs/Makefile | 1 |
36 files changed, 8 insertions, 10 deletions
diff --git a/block/Kconfig b/block/Kconfig index e97934eecec..09acf1b3990 100644 --- a/block/Kconfig +++ b/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/block/Makefile b/block/Makefile index 514c6e4f427..3199c0cdef5 100644 --- a/block/Makefile +++ b/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/fs/partitions/Kconfig b/block/partitions/Kconfig index cb5f0a3f1b0..cb5f0a3f1b0 100644 --- a/fs/partitions/Kconfig +++ b/block/partitions/Kconfig diff --git a/fs/partitions/Makefile b/block/partitions/Makefile index 03af8eac51d..03af8eac51d 100644 --- a/fs/partitions/Makefile +++ b/block/partitions/Makefile diff --git a/fs/partitions/acorn.c b/block/partitions/acorn.c index fbeb697374d..fbeb697374d 100644 --- a/fs/partitions/acorn.c +++ b/block/partitions/acorn.c diff --git a/fs/partitions/acorn.h b/block/partitions/acorn.h index ede82852969..ede82852969 100644 --- a/fs/partitions/acorn.h +++ b/block/partitions/acorn.h diff --git a/fs/partitions/amiga.c b/block/partitions/amiga.c index 70cbf44a156..70cbf44a156 100644 --- a/fs/partitions/amiga.c +++ b/block/partitions/amiga.c diff --git a/fs/partitions/amiga.h b/block/partitions/amiga.h index d094585cada..d094585cada 100644 --- a/fs/partitions/amiga.h +++ b/block/partitions/amiga.h diff --git a/fs/partitions/atari.c b/block/partitions/atari.c index 9875b05e80a..9875b05e80a 100644 --- a/fs/partitions/atari.c +++ b/block/partitions/atari.c diff --git a/fs/partitions/atari.h b/block/partitions/atari.h index fe2d32a89f3..fe2d32a89f3 100644 --- a/fs/partitions/atari.h +++ b/block/partitions/atari.h diff --git a/fs/partitions/check.c b/block/partitions/check.c index e3c63d1c5e1..e3c63d1c5e1 100644 --- a/fs/partitions/check.c +++ b/block/partitions/check.c diff --git a/fs/partitions/check.h b/block/partitions/check.h index d68bf4dc3bc..d68bf4dc3bc 100644 --- a/fs/partitions/check.h +++ b/block/partitions/check.h diff --git a/fs/partitions/efi.c b/block/partitions/efi.c index 6296b403c67..6296b403c67 100644 --- a/fs/partitions/efi.c +++ b/block/partitions/efi.c diff --git a/fs/partitions/efi.h b/block/partitions/efi.h index b69ab729558..b69ab729558 100644 --- a/fs/partitions/efi.h +++ b/block/partitions/efi.h diff --git a/fs/partitions/ibm.c b/block/partitions/ibm.c index d513a07f44b..d513a07f44b 100644 --- a/fs/partitions/ibm.c +++ b/block/partitions/ibm.c diff --git a/fs/partitions/ibm.h b/block/partitions/ibm.h index 08fb0804a81..08fb0804a81 100644 --- a/fs/partitions/ibm.h +++ b/block/partitions/ibm.h diff --git a/fs/partitions/karma.c b/block/partitions/karma.c index 0ea19312706..0ea19312706 100644 --- a/fs/partitions/karma.c +++ b/block/partitions/karma.c diff --git a/fs/partitions/karma.h b/block/partitions/karma.h index c764b2e9df2..c764b2e9df2 100644 --- a/fs/partitions/karma.h +++ b/block/partitions/karma.h diff --git a/fs/partitions/ldm.c b/block/partitions/ldm.c index bd8ae788f68..bd8ae788f68 100644 --- a/fs/partitions/ldm.c +++ b/block/partitions/ldm.c diff --git a/fs/partitions/ldm.h b/block/partitions/ldm.h index 374242c0971..374242c0971 100644 --- a/fs/partitions/ldm.h +++ b/block/partitions/ldm.h diff --git a/fs/partitions/mac.c b/block/partitions/mac.c index 11f688bd76c..11f688bd76c 100644 --- a/fs/partitions/mac.c +++ b/block/partitions/mac.c diff --git a/fs/partitions/mac.h b/block/partitions/mac.h index 3c7d9843638..3c7d9843638 100644 --- a/fs/partitions/mac.h +++ b/block/partitions/mac.h diff --git a/fs/partitions/msdos.c b/block/partitions/msdos.c index 5f79a6677c6..5f79a6677c6 100644 --- a/fs/partitions/msdos.c +++ b/block/partitions/msdos.c diff --git a/fs/partitions/msdos.h b/block/partitions/msdos.h index 38c781c490b..38c781c490b 100644 --- a/fs/partitions/msdos.h +++ b/block/partitions/msdos.h diff --git a/fs/partitions/osf.c b/block/partitions/osf.c index 764b86a0196..764b86a0196 100644 --- a/fs/partitions/osf.c +++ b/block/partitions/osf.c diff --git a/fs/partitions/osf.h b/block/partitions/osf.h index 20ed2315ec1..20ed2315ec1 100644 --- a/fs/partitions/osf.h +++ b/block/partitions/osf.h diff --git a/fs/partitions/sgi.c b/block/partitions/sgi.c index ea8a86dceaf..ea8a86dceaf 100644 --- a/fs/partitions/sgi.c +++ b/block/partitions/sgi.c diff --git a/fs/partitions/sgi.h b/block/partitions/sgi.h index b9553ebdd5a..b9553ebdd5a 100644 --- a/fs/partitions/sgi.h +++ b/block/partitions/sgi.h diff --git a/fs/partitions/sun.c b/block/partitions/sun.c index b5b6fcfb3d3..b5b6fcfb3d3 100644 --- a/fs/partitions/sun.c +++ b/block/partitions/sun.c diff --git a/fs/partitions/sun.h b/block/partitions/sun.h index 2424baa8319..2424baa8319 100644 --- a/fs/partitions/sun.h +++ b/block/partitions/sun.h diff --git a/fs/partitions/sysv68.c b/block/partitions/sysv68.c index 9627ccffc1c..9627ccffc1c 100644 --- a/fs/partitions/sysv68.c +++ b/block/partitions/sysv68.c diff --git a/fs/partitions/sysv68.h b/block/partitions/sysv68.h index bf2f5ffa97a..bf2f5ffa97a 100644 --- a/fs/partitions/sysv68.h +++ b/block/partitions/sysv68.h diff --git a/fs/partitions/ultrix.c b/block/partitions/ultrix.c index 8dbaf9f77a9..8dbaf9f77a9 100644 --- a/fs/partitions/ultrix.c +++ b/block/partitions/ultrix.c diff --git a/fs/partitions/ultrix.h b/block/partitions/ultrix.h index a3cc00b2bde..a3cc00b2bde 100644 --- a/fs/partitions/ultrix.h +++ b/block/partitions/ultrix.h diff --git a/fs/Kconfig b/fs/Kconfig index 5f4c45d4aa1..30145d886bc 100644 --- a/fs/Kconfig +++ b/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/fs/Makefile b/fs/Makefile index d2c3353d547..c36ebec298b 100644 --- a/fs/Makefile +++ b/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/ |