2.6.25

 drivers

diff --git a/drivers/Makefile b/drivers/Makefile
index 8cb37e3..e5e394a 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -5,6 +5,7 @@
 # Rewritten to use lists instead of if-statements.
 #
 
+obj-$(CONFIG_HAVE_GPIO_LIB)   += gpio/
 obj-$(CONFIG_PCI)      += pci/
 obj-$(CONFIG_PARISC)      += parisc/
 obj-$(CONFIG_RAPIDIO)      += rapidio/
@@ -38,7 +39,7 @@ obj-$(CONFIG_SCSI)      += scsi/
 obj-$(CONFIG_ATA)      += ata/
 obj-$(CONFIG_FUSION)      += message/
 obj-$(CONFIG_FIREWIRE)      += firewire/
-obj-$(CONFIG_IEEE1394)      += ieee1394/
+obj-y            += ieee1394/
 obj-$(CONFIG_UIO)      += uio/
 obj-y            += cdrom/
 obj-y            += auxdisplay/
@@ -47,7 +48,6 @@ obj-$(CONFIG_SPI)      += spi/
 obj-$(CONFIG_PCCARD)      += pcmcia/
 obj-$(CONFIG_DIO)      += dio/
 obj-$(CONFIG_SBUS)      += sbus/
-obj-$(CONFIG_KVM)      += kvm/
 obj-$(CONFIG_ZORRO)      += zorro/
 obj-$(CONFIG_MAC)      += macintosh/
 obj-$(CONFIG_ATA_OVER_ETH)   += block/aoe/
@@ -65,6 +65,7 @@ obj-y            += i2c/
 obj-$(CONFIG_W1)      += w1/
 obj-$(CONFIG_POWER_SUPPLY)   += power/
 obj-$(CONFIG_HWMON)      += hwmon/
+obj-$(CONFIG_THERMAL)      += thermal/
 obj-$(CONFIG_WATCHDOG)      += watchdog/
 obj-$(CONFIG_PHONE)      += telephony/
 obj-$(CONFIG_MD)      += md/
@@ -73,10 +74,11 @@ obj-$(CONFIG_ISDN)      += isdn/
 obj-$(CONFIG_EDAC)      += edac/
 obj-$(CONFIG_MCA)      += mca/
 obj-$(CONFIG_EISA)      += eisa/
-obj-$(CONFIG_LGUEST_GUEST)   += lguest/
+obj-y            += lguest/
 obj-$(CONFIG_CPU_FREQ)      += cpufreq/
 obj-$(CONFIG_CPU_IDLE)      += cpuidle/
 obj-$(CONFIG_MMC)      += mmc/
+obj-$(CONFIG_MEMSTICK)      += memstick/
 obj-$(CONFIG_NEW_LEDS)      += leds/
 obj-$(CONFIG_INFINIBAND)   += infiniband/
 obj-$(CONFIG_SGI_SN)      += sn/