diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-30 08:40:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-30 08:40:09 -0500 |
| commit | dd430ca20c40ecccd6954a7efd13d4398f507728 (patch) | |
| tree | b65089436d17b2bcc6054ede2e335a821b50007f /drivers/Makefile | |
| parent | 60e233172eabdd1f831bd48631b9626ce2279d9b (diff) | |
| parent | afadcd788f37bfa62d92662e54a720c26c91becf (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (890 commits)
x86: fix nodemap_size according to nodeid bits
x86: fix overlap between pagetable with bss section
x86: add PCI IDs to k8topology_64.c
x86: fix early_ioremap pagetable ops
x86: use the same pgd_list for PAE and 64-bit
x86: defer cr3 reload when doing pud_clear()
x86: early boot debugging via FireWire (ohci1394_dma=early)
x86: don't special-case pmd allocations as much
x86: shrink some ifdefs in fault.c
x86: ignore spurious faults
x86: remove nx_enabled from fault.c
x86: unify fault_32|64.c
x86: unify fault_32|64.c with ifdefs
x86: unify fault_32|64.c by ifdef'd function bodies
x86: arch/x86/mm/init_32.c printk fixes
x86: arch/x86/mm/init_32.c cleanup
x86: arch/x86/mm/init_64.c printk fixes
x86: unify ioremap
x86: fixes some bugs about EFI memory map handling
x86: use reboot_type on EFI 32
...
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 8cb37e3557d4..d92d4d82d001 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -38,7 +38,7 @@ obj-$(CONFIG_SCSI) += scsi/ | |||
| 38 | obj-$(CONFIG_ATA) += ata/ | 38 | obj-$(CONFIG_ATA) += ata/ |
| 39 | obj-$(CONFIG_FUSION) += message/ | 39 | obj-$(CONFIG_FUSION) += message/ |
| 40 | obj-$(CONFIG_FIREWIRE) += firewire/ | 40 | obj-$(CONFIG_FIREWIRE) += firewire/ |
| 41 | obj-$(CONFIG_IEEE1394) += ieee1394/ | 41 | obj-y += ieee1394/ |
| 42 | obj-$(CONFIG_UIO) += uio/ | 42 | obj-$(CONFIG_UIO) += uio/ |
| 43 | obj-y += cdrom/ | 43 | obj-y += cdrom/ |
| 44 | obj-y += auxdisplay/ | 44 | obj-y += auxdisplay/ |