UBUNTU: [Config] drop the virtual flavour in favour of a split generic et al

Signed-off-by: Andy Whitcroft <apw@canonical.com>

11 files changed, 142 insertions, 1198 deletions

diff --git a/debian.master/abi/3.4.0-2.6/amd64/virtual.modules b/debian.master/abi/3.4.0-2.6/amd64/virtual.modules
deleted file mode 100644
index 632c99e68a5..00000000000
--- a/debian.master/abi/3.4.0-2.6/amd64/virtual.modules
+++ /dev/null
@@ -1,587 +0,0 @@
-6lowpan
-8021q
-8139cp
-8139too
-8390
-acpi_ipmi
-acpi_memhotplug
-acpi_pad
-acpiphp
-act_csum
-act_gact
-act_ipt
-act_mirred
-act_nat
-act_pedit
-act_police
-act_simple
-act_skbedit
-aesni-intel
-aes-x86_64
-af_802154
-af_alg
-af_key
-af-rxrpc
-ah4
-ah6
-algif_hash
-algif_skcipher
-ansi_cprng
-anubis
-appletalk
-arc4
-arptable_filter
-arp_tables
-arpt_mangle
-async_memcpy
-async_pq
-async_raid6_recov
-async_tx
-async_xor
-atm
-authenc
-authencesn
-auth_rpcgss
-autofs4
-ax25
-bch
-bgrt
-binfmt_misc
-blowfish_common
-blowfish_generic
-blowfish-x86_64
-bonding
-br2684
-bridge
-bsd_comp
-btrfs
-BusLogic
-cachefiles
-camellia_generic
-camellia-x86_64
-can
-can-bcm
-can-gw
-can-raw
-cast5
-cast6
-ccm
-cfg80211
-cifs
-cirrusfb
-clip
-cls_basic
-cls_cgroup
-cls_flow
-cls_fw
-cls_route
-cls_rsvp
-cls_rsvp6
-cls_tcindex
-cls_u32
-configfs
-cordic
-cpuid
-cpu-notifier-error-inject
-crc7
-crc8
-crc-ccitt
-crc-itu-t
-cryptd
-cryptoloop
-crypto_null
-crypto_user
-ctr
-cts
-dccp
-dccp_diag
-dccp_ipv4
-dccp_ipv6
-dccp_probe
-de2104x
-de4x5
-decnet
-deflate
-des_generic
-dm-bufio
-dm-crypt
-dmfe
-dm-log
-dm-mirror
-dm-multipath
-dm-persistent-data
-dm-queue-length
-dm-raid
-dm-region-hash
-dm-round-robin
-dm-service-time
-dm-snapshot
-dm-thin-pool
-dm-zero
-dn_rtmsg
-dummy
-e1000
-e1000e
-ebt_802_3
-ebtable_broute
-ebtable_filter
-ebtable_nat
-ebtables
-ebt_among
-ebt_arp
-ebt_arpreply
-ebt_dnat
-ebt_ip
-ebt_ip6
-ebt_limit
-ebt_log
-ebt_mark
-ebt_mark_m
-ebt_nflog
-ebt_pkttype
-ebt_redirect
-ebt_snat
-ebt_stp
-ebt_ulog
-ebt_vlan
-econet
-ec_sys
-einj
-em_cmp
-em_meta
-em_nbyte
-em_text
-em_u32
-eql
-erst-dbg
-esp4
-esp6
-evbug
-ext2
-fat
-faulty
-fb_sys_fops
-fcrypt
-floppy
-fscache
-gameport
-garp
-gcm
-gf128mul
-ghash-clmulni-intel
-ghash-generic
-gre
-hangcheck-timer
-hv_netvsc
-hv_storvsc
-hv_utils
-hv_vmbus
-ieee802154
-ifb
-igbvf
-inet_diag
-ip6_queue
-ip6table_filter
-ip6table_mangle
-ip6table_raw
-ip6_tables
-ip6table_security
-ip6t_ah
-ip6t_eui64
-ip6t_frag
-ip6t_hbh
-ip6t_ipv6header
-ip6t_mh
-ip6t_REJECT
-ip6t_rpfilter
-ip6t_rt
-ip6_tunnel
-ipcomp
-ipcomp6
-ipddp
-ip_gre
-ipip
-ip_queue
-ip_set
-ip_set_bitmap_ip
-ip_set_bitmap_ipmac
-ip_set_bitmap_port
-ip_set_hash_ip
-ip_set_hash_ipport
-ip_set_hash_ipportip
-ip_set_hash_ipportnet
-ip_set_hash_net
-ip_set_hash_netiface
-ip_set_hash_netport
-ip_set_list_set
-iptable_filter
-iptable_mangle
-iptable_nat
-iptable_raw
-ip_tables
-iptable_security
-ipt_ah
-ipt_CLUSTERIP
-ipt_ECN
-ipt_MASQUERADE
-ipt_NETMAP
-ipt_REDIRECT
-ipt_REJECT
-ipt_rpfilter
-ipt_ULOG
-ip_vs
-ip_vs_dh
-ip_vs_ftp
-ip_vs_lblc
-ip_vs_lblcr
-ip_vs_lc
-ip_vs_nq
-ip_vs_pe_sip
-ip_vs_rr
-ip_vs_sed
-ip_vs_sh
-ip_vs_wlc
-ip_vs_wrr
-ipx
-ircomm
-ircomm-tty
-irda
-irlan
-irnet
-iscsi_tcp
-isofs
-ixgbevf
-joydev
-khazad
-lapb
-lec
-lib80211
-lib80211_crypt_ccmp
-lib80211_crypt_tkip
-lib80211_crypt_wep
-libcrc32c
-libiscsi
-libiscsi_tcp
-libsas
-linear
-llc2
-lockd
-lp
-lru_cache
-lrw
-mac80211
-macvlan
-macvtap
-mce-inject
-mce-xeon75xx
-md4
-michael_mic
-microcode
-mip6
-mpoa
-mptbase
-mptctl
-mptfc
-mptlan
-mptsas
-mptscsih
-mptspi
-msdos
-msr
-multipath
-nbd
-ne2k-pci
-netconsole
-netprio_cgroup
-netrom
-nf_conntrack
-nf_conntrack_amanda
-nf_conntrack_broadcast
-nf_conntrack_ftp
-nf_conntrack_h323
-nf_conntrack_ipv4
-nf_conntrack_ipv6
-nf_conntrack_irc
-nf_conntrack_netbios_ns
-nf_conntrack_netlink
-nf_conntrack_pptp
-nf_conntrack_proto_dccp
-nf_conntrack_proto_gre
-nf_conntrack_proto_sctp
-nf_conntrack_proto_udplite
-nf_conntrack_sane
-nf_conntrack_sip
-nf_conntrack_snmp
-nf_conntrack_tftp
-nf_defrag_ipv4
-nf_defrag_ipv6
-nf_nat
-nf_nat_amanda
-nf_nat_ftp
-nf_nat_h323
-nf_nat_irc
-nf_nat_pptp
-nf_nat_proto_dccp
-nf_nat_proto_gre
-nf_nat_proto_sctp
-nf_nat_proto_udplite
-nf_nat_sip
-nf_nat_snmp_basic
-nf_nat_tftp
-nfnetlink
-nfnetlink_acct
-nfnetlink_cttimeout
-nfnetlink_log
-nfnetlink_queue
-nfs
-nfs_acl
-nfsd
-nf_tproxy_core
-nls_cp437
-nls_iso8859-1
-nvram
-oprofile
-output
-overlayfs
-p8023
-parport
-parport_pc
-pcbc
-pci_slot
-pcnet32
-pcrypt
-phonet
-pktgen
-pn_pep
-ppdev
-ppp_async
-ppp_deflate
-ppp_mppe
-pppoatm
-pppoe
-pppox
-ppp_synctty
-pptp
-psmouse
-qla1280
-raid0
-raid1
-raid10
-raid456
-raid6_pq
-raid6test
-raid_class
-raw
-rmd128
-rmd160
-rmd256
-rmd320
-rose
-rxkad
-salsa20_generic
-salsa20-x86_64
-sbs
-sbshc
-sch_atm
-sch_cbq
-sch_choke
-sch_drr
-sch_dsmark
-sch_gred
-sch_hfsc
-sch_htb
-sch_ingress
-sch_mqprio
-sch_multiq
-sch_netem
-sch_plug
-sch_prio
-sch_qfq
-sch_red
-sch_sfb
-sch_sfq
-sch_tbf
-sch_teql
-scsi_tgt
-scsi_transport_fc
-scsi_transport_iscsi
-scsi_transport_sas
-scsi_wait_scan
-sctp
-sctp_probe
-seed
-seqiv
-serio_raw
-serpent_generic
-serpent-sse2-x86_64
-serport
-sha1-ssse3
-sha512_generic
-sit
-slip
-snd
-snd-ens1370
-snd-hrtimer
-snd-hwdep
-snd-mixer-oss
-snd-page-alloc
-snd-pcm
-snd-pcsp
-snd-rawmidi
-snd-seq
-snd-seq-device
-snd-seq-dummy
-snd-seq-midi
-snd-seq-midi-emul
-snd-seq-midi-event
-snd-seq-virmidi
-snd-timer
-softdog
-soundcore
-squashfs
-stp
-sunrpc
-syscopyarea
-sysfillrect
-sysimgblt
-tcp_bic
-tcp_diag
-tcp_highspeed
-tcp_htcp
-tcp_hybla
-tcp_illinois
-tcp_lp
-tcp_probe
-tcp_scalable
-tcp_vegas
-tcp_veno
-tcp_westwood
-tcp_yeah
-tcrypt
-tea
-test-kstrtox
-tgr192
-tipc
-ts_bm
-ts_fsm
-ts_kmp
-tulip
-tunnel4
-tunnel6
-twofish_common
-twofish_generic
-twofish-x86_64
-twofish-x86_64-3way
-udp_diag
-ufs
-uli526x
-usb-storage
-usbtouchscreen
-vesafb
-veth
-vfat
-vga16fb
-vgastate
-video
-virtio_balloon
-vmac
-vmw_balloon
-vmw_pvscsi
-vmxnet3
-wanrouter
-winbond-840
-wp512
-x25
-xcbc
-xen-acpi-processor
-xen-evtchn
-xen-fbfront
-xenfs
-xen-gntalloc
-xen-gntdev
-xen-kbdfront
-xen-netback
-xen-pciback
-xen-privcmd
-xfrm4_mode_beet
-xfrm4_mode_transport
-xfrm4_mode_tunnel
-xfrm4_tunnel
-xfrm6_mode_beet
-xfrm6_mode_ro
-xfrm6_mode_transport
-xfrm6_mode_tunnel
-xfrm6_tunnel
-xfrm_ipcomp
-xfrm_user
-xfs
-xircom_cb
-xor
-x_tables
-xt_addrtype
-xt_AUDIT
-xt_CHECKSUM
-xt_CLASSIFY
-xt_cluster
-xt_comment
-xt_connbytes
-xt_connlimit
-xt_connmark
-xt_CONNSECMARK
-xt_conntrack
-xt_cpu
-xt_CT
-xt_dccp
-xt_devgroup
-xt_dscp
-xt_DSCP
-xt_ecn
-xt_esp
-xt_hashlimit
-xt_helper
-xt_hl
-xt_HL
-xt_IDLETIMER
-xt_iprange
-xt_ipvs
-xt_LED
-xt_length
-xt_limit
-xt_LOG
-xt_mac
-xt_mark
-xt_multiport
-xt_nfacct
-xt_NFLOG
-xt_NFQUEUE
-xt_NOTRACK
-xt_osf
-xt_owner
-xt_physdev
-xt_pkttype
-xt_policy
-xt_quota
-xt_rateest
-xt_RATEEST
-xt_realm
-xt_recent
-xts
-xt_sctp
-xt_SECMARK
-xt_set
-xt_socket
-xt_state
-xt_statistic
-xt_string
-xt_tcpmss
-xt_TCPMSS
-xt_TCPOPTSTRIP
-xt_tcpudp
-xt_TEE
-xt_time
-xt_TPROXY
-xt_TRACE
-xt_u32
-xz_dec_test
-zlib
-zlib_deflate
diff --git a/debian.master/abi/3.4.0-2.6/i386/virtual.modules b/debian.master/abi/3.4.0-2.6/i386/virtual.modules
deleted file mode 100644
index e884e1dbe92..00000000000
--- a/debian.master/abi/3.4.0-2.6/i386/virtual.modules
+++ /dev/null
@@ -1,582 +0,0 @@
-6lowpan
-8021q
-8139cp
-8139too
-8390
-acpi_ipmi
-acpi_pad
-acpiphp
-act_csum
-act_gact
-act_ipt
-act_mirred
-act_nat
-act_pedit
-act_police
-act_simple
-act_skbedit
-aes-i586
-aesni-intel
-af_802154
-af_alg
-af_key
-af-rxrpc
-ah4
-ah6
-algif_hash
-algif_skcipher
-ansi_cprng
-anubis
-apm
-appletalk
-arc4
-arptable_filter
-arp_tables
-arpt_mangle
-async_memcpy
-async_pq
-async_raid6_recov
-async_tx
-async_xor
-atm
-authenc
-authencesn
-auth_rpcgss
-autofs4
-ax25
-bch
-bgrt
-binfmt_misc
-blowfish_common
-blowfish_generic
-bonding
-br2684
-bridge
-bsd_comp
-btrfs
-BusLogic
-cachefiles
-camellia_generic
-can
-can-bcm
-can-gw
-can-raw
-cast5
-cast6
-ccm
-cfg80211
-cifs
-cirrusfb
-clip
-cls_basic
-cls_cgroup
-cls_flow
-cls_fw
-cls_route
-cls_rsvp
-cls_rsvp6
-cls_tcindex
-cls_u32
-configfs
-cordic
-cpuid
-cpu-notifier-error-inject
-crc7
-crc8
-crc-ccitt
-crc-itu-t
-cryptd
-cryptoloop
-crypto_null
-crypto_user
-ctr
-cts
-dccp
-dccp_diag
-dccp_ipv4
-dccp_ipv6
-dccp_probe
-de2104x
-de4x5
-decnet
-deflate
-des_generic
-dm-bufio
-dm-crypt
-dmfe
-dm-log
-dm-mirror
-dm-multipath
-dm-persistent-data
-dm-queue-length
-dm-raid
-dm-region-hash
-dm-round-robin
-dm-service-time
-dm-snapshot
-dm-thin-pool
-dm-zero
-dn_rtmsg
-dummy
-e1000
-e1000e
-ebt_802_3
-ebtable_broute
-ebtable_filter
-ebtable_nat
-ebtables
-ebt_among
-ebt_arp
-ebt_arpreply
-ebt_dnat
-ebt_ip
-ebt_ip6
-ebt_limit
-ebt_log
-ebt_mark
-ebt_mark_m
-ebt_nflog
-ebt_pkttype
-ebt_redirect
-ebt_snat
-ebt_stp
-ebt_ulog
-ebt_vlan
-econet
-ec_sys
-einj
-em_cmp
-em_meta
-em_nbyte
-em_text
-em_u32
-eql
-erst-dbg
-esp4
-esp6
-evbug
-ext2
-fat
-faulty
-fb_sys_fops
-fcrypt
-floppy
-fscache
-gameport
-garp
-gcm
-gf128mul
-ghash-generic
-gre
-hangcheck-timer
-hv_netvsc
-hv_storvsc
-hv_utils
-hv_vmbus
-ieee802154
-ifb
-igbvf
-inet_diag
-ip6_queue
-ip6table_filter
-ip6table_mangle
-ip6table_raw
-ip6_tables
-ip6table_security
-ip6t_ah
-ip6t_eui64
-ip6t_frag
-ip6t_hbh
-ip6t_ipv6header
-ip6t_mh
-ip6t_REJECT
-ip6t_rpfilter
-ip6t_rt
-ip6_tunnel
-ipcomp
-ipcomp6
-ipddp
-ip_gre
-ipip
-ip_queue
-ip_set
-ip_set_bitmap_ip
-ip_set_bitmap_ipmac
-ip_set_bitmap_port
-ip_set_hash_ip
-ip_set_hash_ipport
-ip_set_hash_ipportip
-ip_set_hash_ipportnet
-ip_set_hash_net
-ip_set_hash_netiface
-ip_set_hash_netport
-ip_set_list_set
-iptable_filter
-iptable_mangle
-iptable_nat
-iptable_raw
-ip_tables
-iptable_security
-ipt_ah
-ipt_CLUSTERIP
-ipt_ECN
-ipt_MASQUERADE
-ipt_NETMAP
-ipt_REDIRECT
-ipt_REJECT
-ipt_rpfilter
-ipt_ULOG
-ip_vs
-ip_vs_dh
-ip_vs_ftp
-ip_vs_lblc
-ip_vs_lblcr
-ip_vs_lc
-ip_vs_nq
-ip_vs_pe_sip
-ip_vs_rr
-ip_vs_sed
-ip_vs_sh
-ip_vs_wlc
-ip_vs_wrr
-ipx
-ircomm
-ircomm-tty
-irda
-irlan
-irnet
-iscsi_tcp
-isofs
-ixgbevf
-joydev
-khazad
-lapb
-lec
-lib80211
-lib80211_crypt_ccmp
-lib80211_crypt_tkip
-lib80211_crypt_wep
-libcrc32c
-libiscsi
-libiscsi_tcp
-libsas
-linear
-llc2
-lockd
-lp
-lru_cache
-lrw
-mac80211
-macvlan
-macvtap
-mce-inject
-mce-xeon75xx
-md4
-michael_mic
-microcode
-mip6
-mpoa
-mptbase
-mptctl
-mptfc
-mptlan
-mptsas
-mptscsih
-mptspi
-msdos
-msr
-multipath
-nbd
-ne2k-pci
-netconsole
-netprio_cgroup
-netrom
-nf_conntrack
-nf_conntrack_amanda
-nf_conntrack_broadcast
-nf_conntrack_ftp
-nf_conntrack_h323
-nf_conntrack_ipv4
-nf_conntrack_ipv6
-nf_conntrack_irc
-nf_conntrack_netbios_ns
-nf_conntrack_netlink
-nf_conntrack_pptp
-nf_conntrack_proto_dccp
-nf_conntrack_proto_gre
-nf_conntrack_proto_sctp
-nf_conntrack_proto_udplite
-nf_conntrack_sane
-nf_conntrack_sip
-nf_conntrack_snmp
-nf_conntrack_tftp
-nf_defrag_ipv4
-nf_defrag_ipv6
-nf_nat
-nf_nat_amanda
-nf_nat_ftp
-nf_nat_h323
-nf_nat_irc
-nf_nat_pptp
-nf_nat_proto_dccp
-nf_nat_proto_gre
-nf_nat_proto_sctp
-nf_nat_proto_udplite
-nf_nat_sip
-nf_nat_snmp_basic
-nf_nat_tftp
-nfnetlink
-nfnetlink_acct
-nfnetlink_cttimeout
-nfnetlink_log
-nfnetlink_queue
-nfs
-nfs_acl
-nfsd
-nf_tproxy_core
-nls_cp437
-nls_iso8859-1
-nvram
-oprofile
-output
-overlayfs
-p8023
-parport
-parport_pc
-pcbc
-pci_slot
-pcnet32
-pcrypt
-phonet
-pktgen
-pn_pep
-ppdev
-ppp_async
-ppp_deflate
-ppp_mppe
-pppoatm
-pppoe
-pppox
-ppp_synctty
-pptp
-psmouse
-qla1280
-raid0
-raid1
-raid10
-raid456
-raid6_pq
-raid6test
-raid_class
-raw
-rmd128
-rmd160
-rmd256
-rmd320
-rose
-rxkad
-salsa20_generic
-salsa20-i586
-sbs
-sbshc
-sch_atm
-sch_cbq
-sch_choke
-sch_drr
-sch_dsmark
-sch_gred
-sch_hfsc
-sch_htb
-sch_ingress
-sch_mqprio
-sch_multiq
-sch_netem
-sch_plug
-sch_prio
-sch_qfq
-sch_red
-sch_sfb
-sch_sfq
-sch_tbf
-sch_teql
-scsi_tgt
-scsi_transport_fc
-scsi_transport_iscsi
-scsi_transport_sas
-scsi_wait_scan
-sctp
-sctp_probe
-seed
-seqiv
-serio_raw
-serpent_generic
-serpent-sse2-i586
-serport
-sha512_generic
-sit
-slip
-snd
-snd-ens1370
-snd-hrtimer
-snd-hwdep
-snd-mixer-oss
-snd-page-alloc
-snd-pcm
-snd-pcsp
-snd-rawmidi
-snd-seq
-snd-seq-device
-snd-seq-dummy
-snd-seq-midi
-snd-seq-midi-emul
-snd-seq-midi-event
-snd-seq-virmidi
-snd-timer
-softdog
-soundcore
-squashfs
-stp
-sunrpc
-syscopyarea
-sysfillrect
-sysimgblt
-tcp_bic
-tcp_diag
-tcp_highspeed
-tcp_htcp
-tcp_hybla
-tcp_illinois
-tcp_lp
-tcp_probe
-tcp_scalable
-tcp_vegas
-tcp_veno
-tcp_westwood
-tcp_yeah
-tcrypt
-tea
-test-kstrtox
-tgr192
-tipc
-ts_bm
-ts_fsm
-ts_kmp
-tulip
-tunnel4
-tunnel6
-twofish_common
-twofish_generic
-twofish-i586
-udp_diag
-ufs
-uli526x
-usb-storage
-usbtouchscreen
-vesafb
-veth
-vfat
-vga16fb
-vgastate
-video
-virtio_balloon
-vmac
-vmw_balloon
-vmw_pvscsi
-vmxnet3
-wanrouter
-winbond-840
-wp512
-x25
-xcbc
-xen-acpi-processor
-xen-evtchn
-xen-fbfront
-xenfs
-xen-gntalloc
-xen-gntdev
-xen-kbdfront
-xen-netback
-xen-pciback
-xen-privcmd
-xfrm4_mode_beet
-xfrm4_mode_transport
-xfrm4_mode_tunnel
-xfrm4_tunnel
-xfrm6_mode_beet
-xfrm6_mode_ro
-xfrm6_mode_transport
-xfrm6_mode_tunnel
-xfrm6_tunnel
-xfrm_ipcomp
-xfrm_user
-xfs
-xircom_cb
-xor
-x_tables
-xt_addrtype
-xt_AUDIT
-xt_CHECKSUM
-xt_CLASSIFY
-xt_cluster
-xt_comment
-xt_connbytes
-xt_connlimit
-xt_connmark
-xt_CONNSECMARK
-xt_conntrack
-xt_cpu
-xt_CT
-xt_dccp
-xt_devgroup
-xt_dscp
-xt_DSCP
-xt_ecn
-xt_esp
-xt_hashlimit
-xt_helper
-xt_hl
-xt_HL
-xt_IDLETIMER
-xt_iprange
-xt_ipvs
-xt_LED
-xt_length
-xt_limit
-xt_LOG
-xt_mac
-xt_mark
-xt_multiport
-xt_nfacct
-xt_NFLOG
-xt_NFQUEUE
-xt_NOTRACK
-xt_osf
-xt_owner
-xt_physdev
-xt_pkttype
-xt_policy
-xt_quota
-xt_rateest
-xt_RATEEST
-xt_realm
-xt_recent
-xts
-xt_sctp
-xt_SECMARK
-xt_set
-xt_socket
-xt_state
-xt_statistic
-xt_string
-xt_tcpmss
-xt_TCPMSS
-xt_TCPOPTSTRIP
-xt_tcpudp
-xt_TEE
-xt_time
-xt_TPROXY
-xt_TRACE
-xt_u32
-xz_dec_test
-zlib
-zlib_deflate
diff --git a/debian.master/config/amd64/config.flavour.virtual b/debian.master/config/amd64/config.flavour.virtual
deleted file mode 100644
index ca7c08f516c..00000000000
--- a/debian.master/config/amd64/config.flavour.virtual
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Config options for config.flavour.virtual automatically generated by splitconfig.pl
-#
-# CONFIG_DEFAULT_CFQ is not set
-CONFIG_DEFAULT_DEADLINE=y
-CONFIG_DEFAULT_IOSCHED="deadline"
-# CONFIG_INTEL_IDLE is not set
-CONFIG_NR_CPUS=64
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_SCSI_VIRTIO=m
diff --git a/debian.master/config/i386/config.flavour.virtual b/debian.master/config/i386/config.flavour.virtual
deleted file mode 100644
index 8a4e8b6a0be..00000000000
--- a/debian.master/config/i386/config.flavour.virtual
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Config options for config.flavour.virtual automatically generated by splitconfig.pl
-#
-# CONFIG_INTEL_IDLE is not set
-CONFIG_PHYSICAL_ALIGN=0x100000
-CONFIG_PHYSICAL_START=0x100000
diff --git a/debian.master/control.d/virtual.inclusion-list b/debian.master/control.d/generic-pae.inclusion-list
index 81df8625ede..81df8625ede 100644
--- a/debian.master/control.d/virtual.inclusion-list
+++ b/debian.master/control.d/generic-pae.inclusion-list
diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list
new file mode 100644
index 00000000000..81df8625ede
--- /dev/null
+++ b/debian.master/control.d/generic.inclusion-list
@@ -0,0 +1,138 @@
+arch/*/{crypto,kernel,oprofile}
+crypto/*
+drivers/acpi/*
+drivers/block/nbd.ko
+drivers/block/floppy.ko
+drivers/block/cryptoloop.ko
+drivers/char/hangcheck-timer.ko
+drivers/char/lp.ko
+drivers/char/nvram.ko
+drivers/char/ppdev.ko
+drivers/char/raw.ko
+drivers/hv/*
+drivers/input/evbug.ko
+drivers/input/gameport/gameport.ko
+drivers/input/mouse/psmouse.ko
+drivers/input/serio/serio_raw.ko
+drivers/input/serio/serport.ko
+drivers/input/joydev.ko
+drivers/input/touchscreen/usbtouchscreen.ko
+drivers/input/misc/xen-kbdfront.ko
+drivers/md/*
+drivers/message/fusion*
+drivers/misc/vmw_balloon.ko
+drivers/net/ethernet/8390/8390.ko
+drivers/net/ethernet/realtek/8139too.ko
+drivers/net/ethernet/realtek/8139cp.ko
+drivers/net/appletalk/ipddp.ko
+drivers/net/bonding/bonding.ko
+drivers/net/ppp/bsd_comp.ko
+drivers/net/dummy.ko
+drivers/net/ethernet/intel/e1000/e1000.ko
+drivers/net/ethernet/intel/e1000e/e1000e.ko
+drivers/net/eql.ko
+drivers/net/ifb.ko
+drivers/net/ethernet/intel/igbvf/igbvf.ko
+drivers/net/ethernet/intel/ixgbevf/ixgbevf.ko
+drivers/net/macvlan.ko
+drivers/net/macvtap.ko
+drivers/net/ethernet/8390/ne2k-pci.ko
+drivers/net/netconsole.ko
+drivers/net/ethernet/amd/pcnet32.ko
+drivers/net/hyperv/hv_netvsc.ko
+drivers/net/ppp/*
+drivers/net/slip/*
+drivers/net/veth.ko
+drivers/net/vmxnet3/vmxnet3.ko
+drivers/net/xen-netback/*
+drivers/parport/parport.ko
+drivers/parport/parport_pc.ko
+drivers/pci/hotplug/acpiphp.ko
+drivers/net/ethernet/dec/tulip/*
+drivers/scsi/BusLogic.ko
+drivers/scsi/iscsi_tcp.ko
+drivers/scsi/libiscsi.ko
+drivers/scsi/libiscsi_tcp.ko
+drivers/scsi/libsas/*
+drivers/scsi/qla1280.ko
+drivers/scsi/raid_class.ko
+drivers/scsi/scsi_transport_fc.ko
+drivers/scsi/scsi_transport_iscsi.ko
+drivers/scsi/scsi_transport_sas.ko
+drivers/scsi/scsi_wait_scan.ko
+drivers/scsi/scsi_tgt.ko
+drivers/scsi/vmw_pvscsi.ko
+drivers/scsi/hv_storvsc.ko
+drivers/usb/storage/usb-storage.ko
+drivers/video/cirrusfb.ko
+drivers/video/output.ko
+drivers/video/syscopyarea.ko
+drivers/video/sysfillrect.ko
+drivers/video/sysimgblt.ko
+drivers/video/vesafb.ko
+drivers/video/vga16fb.ko
+drivers/video/vgastate.ko
+drivers/video/xen-fbfront.ko
+drivers/video/fb_sys_fops.ko
+drivers/virtio/virtio_balloon.ko
+drivers/watchdog/softdog.ko
+drivers/xen/*
+fs/binfmt_misc.ko
+fs/btrfs/*
+fs/cachefiles/cachefiles.ko
+fs/configfs/*
+fs/ext*/*
+fs/fat/*
+fs/nls/nls_cp437.ko
+fs/nls/nls_iso8859-1.ko
+fs/isofs/*
+fs/cifs/*
+fs/xfs/*
+fs/ufs/*
+fs/squashfs/*
+fs/nfs/*
+fs/nfsd/*
+fs/nfs_common/*
+fs/fscache/*
+fs/lockd/*
+fs/autofs4/autofs4.ko
+fs/overlayfs/*
+lib/*
+net/802/*
+net/8021q/*
+net/appletalk/*
+net/atm/*
+net/ax25/*
+net/bridge/*
+net/can/*
+net/core/*
+net/dccp/*
+net/decnet/*
+net/econet/*
+net/ieee802154/*
+net/ipv4/*
+net/ipv6/*
+net/ipx/*
+net/irda/*
+net/key/*
+net/lapb/*
+net/llc/*
+net/mac80211/*
+net/netfilter/*
+net/netrom/*
+net/phonet/*
+net/rose/*
+net/rxrpc/*
+net/sched/*
+net/sctp/*
+net/tipc/*
+net/wanrouter/*
+net/wireless/*
+net/x25/*
+net/xfrm/*
+net/sunrpc/auth_gss/auth_rpcgss.ko
+net/sunrpc/sunrpc.ko
+sound/soundcore.ko
+sound/core/*
+sound/pci/snd-ens1370.ko
+sound/drivers/pcsp/snd-pcsp.ko
diff --git a/debian.master/control.d/vars.virtual b/debian.master/control.d/vars.virtual
deleted file mode 100644
index eb7d7955cd7..00000000000
--- a/debian.master/control.d/vars.virtual
+++ /dev/null
@@ -1,6 +0,0 @@
-arch="i386 amd64"
-supported="Virtual"
-target="Geared toward virtual appliances."
-desc="=HUMAN= Virtual Guests"
-bootloader="grub-pc | grub | lilo (>= 19.1)"
-provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, ndiswrapper-modules-1.9"
diff --git a/debian.master/d-i/kernel-versions.in b/debian.master/d-i/kernel-versions.in
index 8594849242f..4d36ecea304 100644
--- a/debian.master/d-i/kernel-versions.in
+++ b/debian.master/d-i/kernel-versions.in
@@ -1,9 +1,7 @@
 # arch	version		flavour		installedname			suffix	bdep
 amd64	PKGVER-ABINUM	generic		PKGVER-ABINUM-generic		-	
-amd64	PKGVER-ABINUM	virtual		PKGVER-ABINUM-virtual		-	
 
 i386	PKGVER-ABINUM	generic-pae	PKGVER-ABINUM-generic-pae	-	
-i386	PKGVER-ABINUM	virtual		PKGVER-ABINUM-virtual		-	
 
 armel	PKGVER-ABINUM	omap		PKGVER-ABINUM-omap		-
 
diff --git a/debian.master/etc/getabis b/debian.master/etc/getabis
index db6f0d0df8d..862f308ecf9 100644
--- a/debian.master/etc/getabis
+++ b/debian.master/etc/getabis
@@ -7,8 +7,8 @@ repo_list=(
 
 getall armel omap
 getall armhf omap
-getall amd64 generic virtual
-getall i386 generic-pae virtual
+getall amd64 generic
+getall i386 generic-pae
 
 # Ports arches and flavours.
 getall powerpc powerpc-smp powerpc64-smp
diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk
index 23d455337e9..a2b78de2307 100644
--- a/debian.master/rules.d/amd64.mk
+++ b/debian.master/rules.d/amd64.mk
@@ -2,7 +2,7 @@ human_arch	= 64 bit x86
 build_arch	= x86_64
 header_arch	= $(build_arch)
 defconfig	= defconfig
-flavours	= generic virtual
+flavours	= generic
 build_image	= bzImage
 kernel_file	= arch/$(build_arch)/boot/bzImage
 install_file	= vmlinuz
diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk
index 9f9656e1889..8ce9276960d 100644
--- a/debian.master/rules.d/i386.mk
+++ b/debian.master/rules.d/i386.mk
@@ -2,7 +2,7 @@ human_arch	= 32 bit x86
 build_arch	= i386
 header_arch	= x86_64
 defconfig	= defconfig
-flavours        = generic-pae virtual
+flavours        = generic-pae
 build_image	= bzImage
 kernel_file	= arch/$(build_arch)/boot/bzImage
 install_file	= vmlinuz