diff --git a/[refs] b/[refs] index 09b06c065c54..f51de9014d1c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74f544c1fc0339acf6f66ff438b8543b1f9faf10 +refs/heads/master: 9f4dab49e5351aead75d20f2d39acd0d6cf5f1c6 diff --git a/trunk/drivers/Makefile b/trunk/drivers/Makefile index e121b66ef082..6326f4dbbdab 100644 --- a/trunk/drivers/Makefile +++ b/trunk/drivers/Makefile @@ -18,6 +18,9 @@ obj-$(CONFIG_ARM_AMBA) += amba/ obj-$(CONFIG_XEN) += xen/ +# regulators early, since some subsystems rely on them to initialize +obj-$(CONFIG_REGULATOR) += regulator/ + # char/ comes before serial/ etc so that the VT console is the boot-time # default. obj-y += char/ @@ -101,5 +104,4 @@ obj-$(CONFIG_PPC_PS3) += ps3/ obj-$(CONFIG_OF) += of/ obj-$(CONFIG_SSB) += ssb/ obj-$(CONFIG_VIRTIO) += virtio/ -obj-$(CONFIG_REGULATOR) += regulator/ obj-$(CONFIG_STAGING) += staging/