summaryrefslogtreecommitdiff
path: root/fs/iso9660/Config.in
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-06-22 23:43:08 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2010-06-22 23:43:08 +0200
commitf3050b0b9ed14596d74a1bcb340ff7f5d86e1b1a (patch)
tree2b1e7628b5bad58c4b4065b9de30321bd02ff502 /fs/iso9660/Config.in
parentb10197dcf2ca1d6afbdf8f131560a3a0a8b9c72d (diff)
parent7b7b4260966a5d991b1dabc82c792fbecd77c63a (diff)
Merge branch 'linux-cleanup' of git://git.busybox.net/~tpetazzoni/git/buildroot
Conflicts: target/Makefile.in
Diffstat (limited to 'fs/iso9660/Config.in')
-rw-r--r--fs/iso9660/Config.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/iso9660/Config.in b/fs/iso9660/Config.in
index 78305814a..4c00583dc 100644
--- a/fs/iso9660/Config.in
+++ b/fs/iso9660/Config.in
@@ -1,7 +1,7 @@
config BR2_TARGET_ROOTFS_ISO9660
bool "iso image"
- depends on BR2_i386
- depends on !BR2_KERNEL_none
+ depends on (BR2_i386 || BR2_x86_64)
+ depends on BR2_LINUX_KERNEL
select BR2_TARGET_ROOTFS_EXT2
select BR2_TARGET_GRUB
help
@@ -13,4 +13,4 @@ config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU
default "fs/iso9660/menu.lst"
comment "iso image requires a Linux kernel to be built"
- depends on BR2_i386 && BR2_KERNEL_none
+ depends on (BR2_i386 || BR2_x86_64) && !BR2_LINUX_KERNEL