diff options
| author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2009-09-21 05:09:22 -0400 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2009-09-21 05:09:22 -0400 |
| commit | 7cce2f4cb7f5f641f78c8e3eea4e7b1b96cb71c0 (patch) | |
| tree | b064d077928cf224660ab1e1841cdab2c9fd8b08 /include/linux/Kbuild | |
| parent | e055f7e873d900925c222cf2d1ec955af4a9ca90 (diff) | |
| parent | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into linux-next
Conflicts:
fs/ubifs/super.c
Merge the upstream tree in order to resolve a conflict with the
per-bdi writeback changes from the linux-2.6-block tree.
Diffstat (limited to 'include/linux/Kbuild')
| -rw-r--r-- | include/linux/Kbuild | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 334a3593cdfd..cff4a101f266 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -268,6 +268,10 @@ ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \ | |||
| 268 | $(srctree)/include/asm-$(SRCARCH)/kvm.h),) | 268 | $(srctree)/include/asm-$(SRCARCH)/kvm.h),) |
| 269 | unifdef-y += kvm.h | 269 | unifdef-y += kvm.h |
| 270 | endif | 270 | endif |
| 271 | ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \ | ||
| 272 | $(srctree)/include/asm-$(SRCARCH)/kvm_para.h),) | ||
| 273 | unifdef-y += kvm_para.h | ||
| 274 | endif | ||
| 271 | unifdef-y += llc.h | 275 | unifdef-y += llc.h |
| 272 | unifdef-y += loop.h | 276 | unifdef-y += loop.h |
| 273 | unifdef-y += lp.h | 277 | unifdef-y += lp.h |