diff options
| author | Andy Whitcroft <apw@canonical.com> | 2010-11-23 16:38:55 +0000 |
|---|---|---|
| committer | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-30 10:15:15 -0700 |
| commit | acab3d0ac1351928f3ae5e97b6d76bf62940c6fd (patch) | |
| tree | e584ce987d1a80dcd90ecbe3bb8fdc90f8dbee2d /ubuntu | |
| parent | 4184e40cedd991fa96d70cc82c8585b961154595 (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. +# + ## ## ## |