diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 17:19:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 17:19:21 -0400 |
| commit | 602cada851b28c5792339786efe872fbdc1f5d41 (patch) | |
| tree | 233d474b74d6038b5bb54a07ad91dd1bb10b0218 /init/Makefile | |
| parent | 82991c6f2c361acc17279b8124d9bf1878973435 (diff) | |
| parent | fee68d1cc0d9bd863e51c16cdcd707737b16bb38 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6: (22 commits)
[PATCH] devfs: Remove it from the feature_removal.txt file
[PATCH] devfs: Last little devfs cleanups throughout the kernel tree.
[PATCH] devfs: Rename TTY_DRIVER_NO_DEVFS to TTY_DRIVER_DYNAMIC_DEV
[PATCH] devfs: Remove the tty_driver devfs_name field as it's no longer needed
[PATCH] devfs: Remove the line_driver devfs_name field as it's no longer needed
[PATCH] devfs: Remove the videodevice devfs_name field as it's no longer needed
[PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed
[PATCH] devfs: Remove the miscdevice devfs_name field as it's no longer needed
[PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree
[PATCH] devfs: Remove devfs_remove() function from the kernel tree
[PATCH] devfs: Remove devfs_mk_cdev() function from the kernel tree
[PATCH] devfs: Remove devfs_mk_bdev() function from the kernel tree
[PATCH] devfs: Remove devfs_mk_symlink() function from the kernel tree
[PATCH] devfs: Remove devfs_mk_dir() function from the kernel tree
[PATCH] devfs: Remove devfs_*_tape() functions from the kernel tree
[PATCH] devfs: Remove devfs support from the sound subsystem
[PATCH] devfs: Remove devfs support from the ide subsystem.
[PATCH] devfs: Remove devfs support from the serial subsystem
[PATCH] devfs: Remove devfs from the init code
[PATCH] devfs: Remove devfs from the partition code
...
Diffstat (limited to 'init/Makefile')
| -rw-r--r-- | init/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/init/Makefile b/init/Makefile index a2300078f2b7..633a268d270d 100644 --- a/init/Makefile +++ b/init/Makefile | |||
| @@ -6,7 +6,6 @@ obj-y := main.o version.o mounts.o initramfs.o | |||
| 6 | obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o | 6 | obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o |
| 7 | 7 | ||
| 8 | mounts-y := do_mounts.o | 8 | mounts-y := do_mounts.o |
| 9 | mounts-$(CONFIG_DEVFS_FS) += do_mounts_devfs.o | ||
| 10 | mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o | 9 | mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o |
| 11 | mounts-$(CONFIG_BLK_DEV_INITRD) += do_mounts_initrd.o | 10 | mounts-$(CONFIG_BLK_DEV_INITRD) += do_mounts_initrd.o |
| 12 | mounts-$(CONFIG_BLK_DEV_MD) += do_mounts_md.o | 11 | mounts-$(CONFIG_BLK_DEV_MD) += do_mounts_md.o |