diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 10:08:04 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 10:08:08 +1000 |
| commit | 7c52ca1bcf6de1f87533ac5f6f419245f7011f46 (patch) | |
| tree | 513e1abc699dc7bc8d5c904bdc4da0370db47552 /drivers/gpu/vga/Makefile | |
| parent | 42295913f01b82e576b46c63ffb1f38f814e5e62 (diff) | |
| parent | 7222f5a6f537eb4639d9dfe0fc7ceeb7c4278c62 (diff) | |
Merge commit 'pci/linux-next'
Conflicts:
arch/powerpc/kernel/pci_64.c
Diffstat (limited to 'drivers/gpu/vga/Makefile')
| -rw-r--r-- | drivers/gpu/vga/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/vga/Makefile b/drivers/gpu/vga/Makefile new file mode 100644 index 000000000000..7cc8c1ed645b --- /dev/null +++ b/drivers/gpu/vga/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_VGA_ARB) += vgaarb.o |