UBUNTU: Ubuntu-2.6.38-12.51

[linux-flexiantxendom0-natty.git] / ubuntu / Makefile

diff --git a/ubuntu/Makefile b/ubuntu/Makefile
index 4dc54c6..cb1aa2b 100644 (file)
--- a/ubuntu/Makefile
+++ b/ubuntu/Makefile
@@ -2,6 +2,13 @@
 # Makefile for the Linux kernel ubuntu supplied third-party device drivers.
 #
 
+#
+# NOTE: to allow drivers to be added and removed without causing merge
+# collisions you should add new entries in the middle of the six lines
+# of ## at the bottom of the list.  Always add three lines of ## above
+# your new entry and maintain the six lines below.
+#
+
 ##
 ##
 ##
@@ -33,6 +40,10 @@ obj-$(CONFIG_SCSI_ISCSITARGET)       += iscsitarget/
 ##
 ##
 ##
+obj-$(CONFIG_AUFS_FS)          += aufs/
+##
+##
+##
 obj-$(CONFIG_RTL8192SE)                += rtl8192se/
 ##
 ##