>From 926f784915b3db61344f26be66dbe86d5deb733b Mon Sep 17 00:00:00 2001 From: Stefan Bader Date: Tue, 21 Apr 2009 19:28:34 +0200 Subject: [PATCH] UBUNTU: ubuntu: Rename config option of prism2_usb to prevent staging driver from building Bug: #325366 The driver from staging is being build because both use the some config option (CONFIG_PRISM2_USB). Rename the ubuntu version to CONFIG_PRISM2_USB_LUM and let only this to be built. Signed-off-by: Stefan Bader --- debian/config/amd64/config | 2 +- debian/config/armel/config | 2 +- debian/config/i386/config | 2 +- debian/config/lpia/config | 2 +- ubuntu/misc/wireless/Kconfig | 2 +- ubuntu/misc/wireless/Makefile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/config/amd64/config b/debian/config/amd64/config index 73bd8bc..e127732 100644 --- a/debian/config/amd64/config +++ b/debian/config/amd64/config @@ -2376,7 +2376,7 @@ CONFIG_PRINTER=m CONFIG_PRINTK=y CONFIG_PRINTK_TIME=y CONFIG_PRINT_QUOTA_WARNING=y -CONFIG_PRISM2_USB=m +CONFIG_PRISM2_USB_LUM=m CONFIG_PRISM54=m CONFIG_PROC_EVENTS=y CONFIG_PROC_FS=y diff --git a/debian/config/armel/config b/debian/config/armel/config index de3a8d5..aed7c7e 100644 --- a/debian/config/armel/config +++ b/debian/config/armel/config @@ -295,7 +295,7 @@ CONFIG_PLIST=y # CONFIG_PREEMPT is not set CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_PRINTK=y -# CONFIG_PRISM2_USB is not set +# CONFIG_PRISM2_USB_LUM is not set CONFIG_PROC_FS=y CONFIG_PROC_PAGE_MONITOR=y CONFIG_PROC_SYSCTL=y diff --git a/debian/config/i386/config b/debian/config/i386/config index 6d94474..8221347 100644 --- a/debian/config/i386/config +++ b/debian/config/i386/config @@ -2508,7 +2508,7 @@ CONFIG_PRINTER=m CONFIG_PRINTK=y CONFIG_PRINTK_TIME=y CONFIG_PRINT_QUOTA_WARNING=y -CONFIG_PRISM2_USB=m +CONFIG_PRISM2_USB_LUM=m CONFIG_PRISM54=m CONFIG_PROC_EVENTS=y CONFIG_PROC_FS=y diff --git a/debian/config/lpia/config b/debian/config/lpia/config index 0ea15d9..8a8bc91 100644 --- a/debian/config/lpia/config +++ b/debian/config/lpia/config @@ -2304,7 +2304,7 @@ CONFIG_PRINTER=m CONFIG_PRINTK=y CONFIG_PRINTK_TIME=y CONFIG_PRINT_QUOTA_WARNING=y -CONFIG_PRISM2_USB=m +CONFIG_PRISM2_USB_LUM=m CONFIG_PRISM54=m # CONFIG_PROCESSOR_SELECT is not set CONFIG_PROC_FS=y diff --git a/ubuntu/misc/wireless/Kconfig b/ubuntu/misc/wireless/Kconfig index 964cedc..a4fca66 100644 --- a/ubuntu/misc/wireless/Kconfig +++ b/ubuntu/misc/wireless/Kconfig @@ -10,7 +10,7 @@ config P80211 default n depends on NET -config PRISM2_USB +config PRISM2_USB_LUM tristate "Prism2 based USB devices" default m depends on NET diff --git a/ubuntu/misc/wireless/Makefile b/ubuntu/misc/wireless/Makefile index 376aa36..07a1b32 100644 --- a/ubuntu/misc/wireless/Makefile +++ b/ubuntu/misc/wireless/Makefile @@ -4,4 +4,4 @@ obj-$(CONFIG_WIRELESS_ACX) += acx/ obj-$(CONFIG_P80211) += p80211/ -obj-$(CONFIG_PRISM2_USB) += prism2_usb/ +obj-$(CONFIG_PRISM2_USB_LUM) += prism2_usb/ -- 1.5.4.3