# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: address@hidden # target_branch: http://bzr.savannah.gnu.org/r/grub/trunk/grub/ # testament_sha1: 53580e95df91a29167d3b8747810d6e53a1c7029 # timestamp: 2013-02-17 21:50:09 +0100 # base_revision_id: address@hidden # # Begin patch === modified file 'grub-core/Makefile.core.def' --- grub-core/Makefile.core.def 2013-02-01 20:49:29 +0000 +++ grub-core/Makefile.core.def 2013-02-17 20:46:50 +0000 @@ -1384,9 +1384,10 @@ module = { name = linux16; - i386_pc = loader/i386/pc/linux.c; - i386_pc = lib/cmdline.c; + common = loader/i386/pc/linux.c; + common = lib/cmdline.c; enable = i386_pc; + enable = i386_coreboot; }; module = { # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSkyhLgAAZRfgAAQUPP//16D AgC/7//wUAP+5123Y3Gjm7bNwSiJMGjUNGRqeU9CaniZhU2gnqMgkoTTU2jQ1PUyYUanqAHqD1DQ AEoIJoamqfkap7JNTxIPUAyHqMgGA0AAA0AAAAAASSQ0TCbQptMjU0NAaDTRoA2fC8bhDiaK2fHa rq7paUDYZpWjvHOHsvj+fbuezMuNv2Tj5SsV1ORFoOz+Fg/Ds+uXccKt42x7beftletHa5oXZ1Zt VJKV32ylB6rr6vvvzo+CMqFd2Cmk9k7DYp+Q7C2CAvK2ckvvPXYfLzxG/3YGrUZglk3DC51OrL/f SwRV2a4REg+ipPruB1EPcFFEUvcSqy4gyYxvLvSJHJEaBGOWcf0VE9eEIbqz0e+X6gzRHCClog+X EehWmz/MW8tS9cMR4u2ZnwNzBXwics7mbsVGCNxWOS0zZEpfYRJpXZQHN/8nAQW0phvjri2SmCbi o8Rgwopxg696zlrtZMJmLsQjO9tJS/NYlMP5xtVZqpzhE8x+xZ3Wjx0Nhjk0e8LRRpJUkrY2u0x6 k4V3swrMAHIbT2YTwvTyFXTx8Ly7B0HFo1XsXjwurlSLiOp1UqGwaX1GJlS041yd1xrQx+K/mSbp z6cJsem3X5YtJ1zYmyQBpLEmE4rl1Xj9RUfS1deanHxn1yDciRuVFPmHfBl3c76JPBXRplQwygOO 1oecf5Iy3pUTTbA9gl/pk12i6LyzJMJeqHhtAp7fmXZ83MiYcxZ8on0nG8SHchRZD1K5DsPO5K3e SP7Y4XbJl6WhOFLz1aVN/0rcru+nqyxmZ2LnBNeucMQ9Fx6w2FudOUX1dxp9RUOe+bvpzDUWCLuv DAw0WbSdksgcJjXytsbnXRcHubtcr8Vm8ML7KfP7kMUVIXpXtYGeXWu03VPHBIjM/laMGa8OPIzb KlvjLTOe8RqjsVL4FoE1Ii80PsMTEWGNb9JYGJrCSIWQqiVQDLfmLKqrHtbv3ppqiTmDZih21PKD tCmH05ar47wlsnB20jmxg2cuDLcJ6cGkJgc0He5iMiks9OLpWQbU2o0SZZaxbh2C/2qiupKPOJLO 5PRzctpYeCUsINVzEUnfIkhBcY96IqDqlDEUQtmwmMkupyV5oDRcVrCRLzHpSFIbqUGROX5NqDKw XdLeCndBTPJmNWStmLZrF4PO2D7Kw3lxdn0E0E2lnc6uOzdBGR1BQ0VEhFCzpUiiT75OD74bOEKi y5ChhpAp0bLA2rXISgNYnLGiTQwMbFZvnpgRO4EI3U0FjEsk9BGv+0TThQD2VWmIgFrG8hKY3NE5 KnWdiXJUFNaRmqlGPEp6juyi2uTGkKCOo6JcUpBWSYp/xdyRThQkCkyhLgA=