diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2010-03-12 17:13:25 -0800 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-06-25 12:16:51 -0600 |
| commit | a79c66b5b6231570d6233b1188ad0924e64d3f89 (patch) | |
| tree | 90a505fafcd5d36cdcb7b3d5ca7e4c12bddd3986 | |
| parent | 76e10d158efb6d4516018846f60c2ab5501900bc (diff) | |
SAUCE only changes from 27df456 UBUNTU: (no-up) fold down debian for ubuntu-q v3.3-rc1 rebase
Signed-off-by: John Rigby <john.rigby@linaro.org>
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/powerpc/Kconfig | 2 | ||||
| -rw-r--r-- | arch/x86/Kconfig | 8 | ||||
| -rw-r--r-- | ubuntu/Kconfig | 17 | ||||
| -rw-r--r-- | ubuntu/Makefile | 20 | ||||
| -rw-r--r-- | ubuntu/include/README | 4 |
7 files changed, 64 insertions, 2 deletions
@@ -354,14 +354,23 @@ CFLAGS_KERNEL = AFLAGS_KERNEL = CFLAGS_GCOV = -fprofile-arcs -ftest-coverage +# Prefer linux-backports-modules +ifneq ($(KBUILD_SRC),) +ifneq ($(shell if test -e $(KBUILD_OUTPUT)/ubuntu-build; then echo yes; fi),yes) +UBUNTUINCLUDE := -I/usr/src/linux-headers-lbm-$(KERNELRELEASE) +endif +endif # Use LINUXINCLUDE when you must reference the include/ directory. # Needed to be compatible with the O= option -LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include \ +LINUXINCLUDE := $(UBUNTUINCLUDE) -I$(srctree)/arch/$(hdr-arch)/include \ -Iarch/$(hdr-arch)/include/generated -Iinclude \ $(if $(KBUILD_SRC), -I$(srctree)/include) \ -include $(srctree)/include/linux/kconfig.h +# UBUNTU: Include our third party driver stuff too +LINUXINCLUDE += -Iubuntu/include $(if $(KBUILD_SRC),-I$(srctree)/ubuntu/include) + KBUILD_CPPFLAGS := -D__KERNEL__ KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ @@ -507,7 +516,7 @@ scripts: scripts_basic include/config/auto.conf include/config/tristate.conf # Objects we will link into vmlinux / subdirs we need to visit init-y := init/ -drivers-y := drivers/ sound/ firmware/ +drivers-y := drivers/ sound/ firmware/ ubuntu/ net-y := net/ libs-y := lib/ core-y := usr/ diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 36586dba6fa..9469ca1bae7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -2295,6 +2295,8 @@ source "net/Kconfig" source "drivers/Kconfig" +source "ubuntu/Kconfig" + source "fs/Kconfig" source "arch/arm/Kconfig.debug" diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index feab3bad6d0..22a6e2f99ea 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -994,6 +994,8 @@ source "net/Kconfig" source "drivers/Kconfig" +source "ubuntu/Kconfig" + source "fs/Kconfig" source "arch/powerpc/sysdev/qe_lib/Kconfig" diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index c9866b0b77d..c8712ea749e 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -392,6 +392,12 @@ config X86_UV # Following is an alphabetically sorted list of 32 bit extended platforms # Please maintain the alphabetic order if and when there are additions +config X86_LPIA + bool "LPIA-compatible" + depends on X86_32 && X86_PC + help + Choose this option if your computer is an LPIA platform. + config X86_INTEL_CE bool "CE4100 TV platform" depends on PCI @@ -2219,6 +2225,8 @@ source "net/Kconfig" source "drivers/Kconfig" +source "ubuntu/Kconfig" + source "drivers/firmware/Kconfig" source "fs/Kconfig" diff --git a/ubuntu/Kconfig b/ubuntu/Kconfig new file mode 100644 index 00000000000..f15ccd8b7f4 --- /dev/null +++ b/ubuntu/Kconfig @@ -0,0 +1,17 @@ +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. +# + +## +## +## +## +## +## + +endmenu diff --git a/ubuntu/Makefile b/ubuntu/Makefile new file mode 100644 index 00000000000..5823ca0b2f6 --- /dev/null +++ b/ubuntu/Makefile @@ -0,0 +1,20 @@ +# +# 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. +# + +## +## +## +## +## +## + +# This is a stupid trick to get kbuild to create ubuntu/built-in.o +obj- += foo.o diff --git a/ubuntu/include/README b/ubuntu/include/README new file mode 100644 index 00000000000..adc8d33e6d8 --- /dev/null +++ b/ubuntu/include/README @@ -0,0 +1,4 @@ +Only use this directory for things which need to share their headers with +other parts of the kernel or other modules in ubuntu/ + +Otherwise, keep them local to the module directory. |