diff options
| author | Andy Whitcroft <apw@canonical.com> | 2010-11-23 16:38:55 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:47:35 -0600 |
| commit | 5e4720c1539ea4a8fd375fbb3a456c117a80e147 (patch) | |
| tree | a93537a42aca15575db8590044b4a752d65b41e8 /ubuntu | |
| parent | 5abe14bec7860b9684adca0a9a692442a024d689 (diff) | |
UBUNTU: (no-up): document the new ## scheme
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Diffstat (limited to 'ubuntu')
| -rw-r--r-- | ubuntu/Kconfig | 7 | ||||
| -rw-r--r-- | ubuntu/Makefile | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/ubuntu/Kconfig b/ubuntu/Kconfig index e13b77f22c5..443457ed867 100644 --- a/ubuntu/Kconfig +++ b/ubuntu/Kconfig @@ -1,5 +1,12 @@ menu "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. +# + ## ## ## diff --git a/ubuntu/Makefile b/ubuntu/Makefile index 4dc54c6736a..e7e5b29d7de 100644 --- 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. +# + ## ## ## |