[PATCH 1/4] UBUNTU: [Config] standardise CONFIG_STAGING=y
Andy Whitcroft
apw at canonical.com
Mon Jun 15 09:28:09 UTC 2009
Standardise enabling CONFIG_STAGING, take the defaults for drivers in
staging.
Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
debian/config/amd64/config.common.amd64 | 3 --
debian/config/armel/config.common.armel | 19 ++++++++++++++-
debian/config/config.common.ubuntu | 3 ++
debian/config/i386/config.common.i386 | 3 --
debian/config/lpia/config.common.lpia | 40 ++++++++++++++++++++++++++++++-
5 files changed, 60 insertions(+), 8 deletions(-)
diff --git a/debian/config/amd64/config.common.amd64 b/debian/config/amd64/config.common.amd64
index 3a9716f..047aece 100644
--- a/debian/config/amd64/config.common.amd64
+++ b/debian/config/amd64/config.common.amd64
@@ -94,7 +94,6 @@ CONFIG_AMIGA_PARTITION=y
# CONFIG_ANDROID is not set
# CONFIG_ANDROID_BINDER_IPC is not set
# CONFIG_ANDROID_LOGGER is not set
-# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
# CONFIG_ANDROID_RAM_CONSOLE is not set
# CONFIG_ANDROID_TIMED_GPIO is not set
CONFIG_APPLICOM=m
@@ -2827,8 +2826,6 @@ CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
CONFIG_SSB_SPROM=y
CONFIG_SSFDC=m
CONFIG_STACKTRACE=y
-CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
CONFIG_STALDRV=y
CONFIG_STALLION=m
# CONFIG_STANDALONE is not set
diff --git a/debian/config/armel/config.common.armel b/debian/config/armel/config.common.armel
index 15d3415..75d53d7 100644
--- a/debian/config/armel/config.common.armel
+++ b/debian/config/armel/config.common.armel
@@ -7,6 +7,11 @@ CONFIG_AEABI=y
# CONFIG_AFS_FS is not set
# CONFIG_AF_RXRPC is not set
CONFIG_ALIGNMENT_TRAP=y
+# CONFIG_ANDROID is not set
+# CONFIG_ANDROID_BINDER_IPC is not set
+# CONFIG_ANDROID_LOGGER is not set
+# CONFIG_ANDROID_RAM_CONSOLE is not set
+# CONFIG_ANDROID_TIMED_GPIO is not set
# CONFIG_APM_EMULATION is not set
# CONFIG_ARCH_AAEC2000 is not set
# CONFIG_ARCH_AT91 is not set
@@ -64,6 +69,7 @@ CONFIG_ARM=y
# CONFIG_ARM_ERRATA_411920 is not set
CONFIG_ARM_THUMB=y
CONFIG_ARM_UNWIND=y
+# CONFIG_ASUS_OLED is not set
CONFIG_ATA=y
# CONFIG_ATALK is not set
# CONFIG_ATA_OVER_ETH is not set
@@ -73,6 +79,7 @@ CONFIG_AUDIT_GENERIC=y
# CONFIG_AUXDISPLAY is not set
# CONFIG_AVERATEC_5100P is not set
# CONFIG_AX88796 is not set
+# CONFIG_B3DFG is not set
# CONFIG_B44 is not set
# CONFIG_BATTERY_BQ27x00 is not set
# CONFIG_BATTERY_DS2760 is not set
@@ -112,6 +119,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_CIFS is not set
CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/mtdblock2 rw rootfstype=jffs2 ip=off"
# CONFIG_CODA_FS is not set
+# CONFIG_COMEDI is not set
CONFIG_COMMON_CLKDEV=y
CONFIG_COMPAT_BRK=y
# CONFIG_CONFIGFS_FS is not set
@@ -214,8 +222,10 @@ CONFIG_DEFAULT_IOSCHED="cfq"
# CONFIG_DM9000 is not set
# CONFIG_DMADEVICES is not set
# CONFIG_DS1682 is not set
+# CONFIG_DST is not set
# CONFIG_DUMMY is not set
# CONFIG_DVB_CORE is not set
+# CONFIG_ECHO is not set
# CONFIG_ECONET is not set
# CONFIG_ECRYPT_FS is not set
# CONFIG_EEPROM_93CX6 is not set
@@ -280,6 +290,7 @@ CONFIG_HARDIRQS_SW_RESEND=y
CONFIG_HAVE_AOUT=y
CONFIG_HAVE_CLK=y
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+# CONFIG_HECI is not set
# CONFIG_HFSPLUS_FS is not set
# CONFIG_HFS_FS is not set
CONFIG_HID=y
@@ -337,6 +348,7 @@ CONFIG_INET_XFRM_MODE_TUNNEL=y
CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_MIMIO is not set
# CONFIG_INPUT_MISC is not set
# CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_MOUSEDEV is not set
@@ -383,6 +395,7 @@ CONFIG_LEDS_GPIO_PLATFORM=y
# CONFIG_LEDS_TRIGGERS is not set
CONFIG_LEGACY_PTY_COUNT=0
CONFIG_LIB80211=m
+# CONFIG_LINE6_USB is not set
# CONFIG_LLC2 is not set
# CONFIG_LMPCM_USB is not set
CONFIG_LOCKD=y
@@ -412,6 +425,7 @@ CONFIG_MEDIA_TUNER_TEA5761=y
CONFIG_MEDIA_TUNER_TEA5767=y
CONFIG_MEDIA_TUNER_XC2028=y
CONFIG_MEDIA_TUNER_XC5000=y
+# CONFIG_MEILHAUS is not set
# CONFIG_MFD_ASIC3 is not set
# CONFIG_MFD_CORE is not set
# CONFIG_MFD_SM501 is not set
@@ -567,9 +581,11 @@ CONFIG_PAGE_OFFSET=0xC0000000
# CONFIG_PHONET is not set
CONFIG_PHYLIB=y
# CONFIG_PHYS_ADDR_T_64BIT is not set
+# CONFIG_PLAN9AUTH is not set
# CONFIG_PMIC_DA903X is not set
# CONFIG_PM_DEBUG is not set
# CONFIG_PM_DISABLE_CONSOLE is not set
+# CONFIG_POHMELFS is not set
# CONFIG_POSIX_MQUEUE is not set
# CONFIG_PPP is not set
# CONFIG_PRINTK_TIME is not set
@@ -743,7 +759,6 @@ CONFIG_SPI_GPIO=m
# CONFIG_SPI_TLE62X0 is not set
# CONFIG_SSB is not set
# CONFIG_SSFDC is not set
-# CONFIG_STAGING is not set
CONFIG_STANDALONE=y
CONFIG_SUNRPC=y
# CONFIG_SYSFS_DEPRECATED_V2 is not set
@@ -773,6 +788,7 @@ CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_TPS65010=m
# CONFIG_TP_SMAPI is not set
# CONFIG_TP_SMAPI_EC is not set
+# CONFIG_TRANZPORT is not set
# CONFIG_TUN is not set
# CONFIG_TWL4030_CORE is not set
# CONFIG_UDF_FS is not set
@@ -829,6 +845,7 @@ CONFIG_USB_HID=y
# CONFIG_USB_IBMCAM is not set
# CONFIG_USB_IDMOUSE is not set
# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_IP_COMMON is not set
# CONFIG_USB_ISIGHTFW is not set
# CONFIG_USB_ISP116X_HCD is not set
# CONFIG_USB_KAWETH is not set
diff --git a/debian/config/config.common.ubuntu b/debian/config/config.common.ubuntu
index 08eb77a..650c4f1 100644
--- a/debian/config/config.common.ubuntu
+++ b/debian/config/config.common.ubuntu
@@ -3,6 +3,7 @@
#
# CONFIG_ACCESSIBILITY is not set
CONFIG_AIO=y
+# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
CONFIG_ANON_INODES=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
# CONFIG_ARPD is not set
@@ -345,6 +346,8 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
CONFIG_SSB_POSSIBLE=y
CONFIG_STACKTRACE_SUPPORT=y
# CONFIG_STACK_TRACER is not set
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
CONFIG_STE10XP=m
# CONFIG_STRIP_ASM_SYMS is not set
CONFIG_SUSPEND=y
diff --git a/debian/config/i386/config.common.i386 b/debian/config/i386/config.common.i386
index 1f5d61d..afb7fa4 100644
--- a/debian/config/i386/config.common.i386
+++ b/debian/config/i386/config.common.i386
@@ -97,7 +97,6 @@ CONFIG_ALI_FIR=m
CONFIG_ALTERA_PCIE_CHDMA=m
CONFIG_AMD8111_ETH=m
CONFIG_AMIGA_PARTITION=y
-# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
CONFIG_APM=m
# CONFIG_APM_ALLOW_INTS is not set
# CONFIG_APM_CPU_IDLE is not set
@@ -3045,8 +3044,6 @@ CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
CONFIG_SSB_SPROM=y
CONFIG_SSFDC=m
CONFIG_STACKTRACE=y
-CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
CONFIG_STALDRV=y
CONFIG_STALLION=m
# CONFIG_STANDALONE is not set
diff --git a/debian/config/lpia/config.common.lpia b/debian/config/lpia/config.common.lpia
index 4ebf448..c45c898 100644
--- a/debian/config/lpia/config.common.lpia
+++ b/debian/config/lpia/config.common.lpia
@@ -64,6 +64,7 @@ CONFIG_AFS_FS=m
# CONFIG_AFS_FSCACHE is not set
CONFIG_AF_RXRPC=m
# CONFIG_AF_RXRPC_DEBUG is not set
+# CONFIG_AGNX is not set
CONFIG_AGP=m
CONFIG_AGP_ALI=m
CONFIG_AGP_AMD=m
@@ -91,8 +92,13 @@ CONFIG_AIRO_CS=m
CONFIG_ALIM1535_WDT=m
CONFIG_ALIM7101_WDT=m
CONFIG_ALI_FIR=m
+# CONFIG_ALTERA_PCIE_CHDMA is not set
CONFIG_AMD8111_ETH=m
CONFIG_AMIGA_PARTITION=y
+# CONFIG_ANDROID is not set
+# CONFIG_ANDROID_BINDER_IPC is not set
+# CONFIG_ANDROID_LOGGER is not set
+# CONFIG_ANDROID_RAM_CONSOLE is not set
# CONFIG_APM is not set
CONFIG_APPLICOM=m
CONFIG_APRICOT=m
@@ -131,6 +137,7 @@ CONFIG_ARCNET_RIM_I=m
CONFIG_ARLAN=m
CONFIG_ASK_IP_FIB_HASH=y
CONFIG_ASUS_LAPTOP=m
+# CONFIG_ASUS_OLED is not set
CONFIG_ASYNC_CORE=m
CONFIG_ASYNC_MEMCPY=m
# CONFIG_ASYNC_TX_DMA is not set
@@ -161,6 +168,7 @@ CONFIG_AUDIT_TREE=y
CONFIG_AUTOFS_FS=m
CONFIG_AUXDISPLAY=y
CONFIG_AVERATEC_5100P=m
+# CONFIG_B3DFG is not set
CONFIG_B43=m
CONFIG_B43LEGACY=m
CONFIG_B43LEGACY_DEBUG=y
@@ -332,6 +340,7 @@ CONFIG_CLS_U32_MARK=y
# CONFIG_CLS_U32_PERF is not set
# CONFIG_CMDLINE_BOOL is not set
CONFIG_CODA_FS=m
+# CONFIG_COMEDI is not set
CONFIG_COMPAL_LAPTOP=m
# CONFIG_COMPAT_BRK is not set
# CONFIG_COMPAT_VDSO is not set
@@ -544,6 +553,7 @@ CONFIG_DRM_TDFX=m
CONFIG_DRM_VIA=m
CONFIG_DS1682=m
# CONFIG_DSCC4 is not set
+# CONFIG_DST is not set
CONFIG_DTLK=m
CONFIG_DUMMY=m
CONFIG_DVB_AU8522=m
@@ -661,6 +671,7 @@ CONFIG_E1000E=m
CONFIG_E2100=m
CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_ECHO is not set
# CONFIG_ECONET is not set
CONFIG_ECRYPT_FS=m
CONFIG_EDAC=y
@@ -706,9 +717,11 @@ CONFIG_EMBEDDED=y
CONFIG_ENCLOSURE_SERVICES=m
# CONFIG_ENIC is not set
CONFIG_EPIC100=m
+# CONFIG_EPL is not set
CONFIG_EQUALIZER=m
CONFIG_ES3210=m
CONFIG_ESI_DONGLE=m
+# CONFIG_ET131X is not set
CONFIG_ETH16I=m
CONFIG_EUROTECH_WDT=m
CONFIG_EWRK3=m
@@ -906,6 +919,7 @@ CONFIG_HDLC_FR=m
CONFIG_HDLC_PPP=m
CONFIG_HDLC_RAW=m
CONFIG_HDLC_RAW_ETH=m
+# CONFIG_HECI is not set
CONFIG_HERMES=m
CONFIG_HERMES_CACHE_FW_ON_INIT=y
CONFIG_HFSPLUS_FS=m
@@ -1034,6 +1048,7 @@ CONFIG_IBMOL=m
CONFIG_IBMTR=m
CONFIG_IBM_ASM=m
# CONFIG_ICS932S401 is not set
+# CONFIG_IDE_PHISON is not set
CONFIG_IEEE1394=m
CONFIG_IEEE1394_DV1394=m
CONFIG_IEEE1394_ETH1394=m
@@ -1099,6 +1114,7 @@ CONFIG_INPUT_EVDEV=m
CONFIG_INPUT_JOYDEV=m
CONFIG_INPUT_JOYSTICK=y
CONFIG_INPUT_KEYSPAN_REMOTE=m
+# CONFIG_INPUT_MIMIO is not set
CONFIG_INPUT_MISC=y
CONFIG_INPUT_MOUSE=y
CONFIG_INPUT_MOUSEDEV=y
@@ -1387,6 +1403,7 @@ CONFIG_LIBERTAS_SDIO=m
CONFIG_LIBERTAS_USB=m
CONFIG_LIBIPW=m
CONFIG_LIBIPW_DEBUG=y
+# CONFIG_LINE6_USB is not set
CONFIG_LITELINK_DONGLE=m
# CONFIG_LKDTM is not set
CONFIG_LLC=y
@@ -1449,6 +1466,7 @@ CONFIG_MD_RAID1=m
CONFIG_MD_RAID10=m
CONFIG_MD_RAID456=m
CONFIG_MD_RAID6_PQ=m
+# CONFIG_ME4000 is not set
CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_TUNER=m
CONFIG_MEDIA_TUNER_MC44S803=m
@@ -1474,6 +1492,7 @@ CONFIG_MEGARAID_MAILBOX=m
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_SAS=m
+# CONFIG_MEILHAUS is not set
# CONFIG_MEMTEST is not set
CONFIG_MFD_CORE=m
CONFIG_MFD_SM501=m
@@ -1888,6 +1907,7 @@ CONFIG_OPROFILE=m
# CONFIG_OPROFILE_IBS is not set
# CONFIG_OPTIMIZE_INLINING is not set
CONFIG_OSF_PARTITION=y
+# CONFIG_OTUS is not set
CONFIG_P54_COMMON=m
CONFIG_P54_LEDS=y
CONFIG_P54_PCI=m
@@ -1897,6 +1917,7 @@ CONFIG_PACKARDBELL_E5=m
CONFIG_PACKET=m
CONFIG_PAGE_OFFSET=0xC0000000
# CONFIG_PANASONIC_LAPTOP is not set
+# CONFIG_PANEL is not set
# CONFIG_PANTHERLORD_FF is not set
CONFIG_PARAVIRT=y
# CONFIG_PARAVIRT_CLOCK is not set
@@ -2056,6 +2077,7 @@ CONFIG_PHYLIB=m
CONFIG_PHYSICAL_ALIGN=0x100000
CONFIG_PHYSICAL_START=0x100000
# CONFIG_PHYS_ADDR_T_64BIT is not set
+# CONFIG_PLAN9AUTH is not set
CONFIG_PLIP=m
CONFIG_PLX_HERMES=m
CONFIG_PM_DEBUG=y
@@ -2070,6 +2092,8 @@ CONFIG_PNPACPI=y
CONFIG_PNPBIOS=y
CONFIG_PNPBIOS_PROC_FS=y
CONFIG_PNP_DEBUG_MESSAGES=y
+# CONFIG_POCH is not set
+# CONFIG_POHMELFS is not set
CONFIG_POSIX_MQUEUE=y
CONFIG_POSIX_MQUEUE_SYSCTL=y
# CONFIG_POWER_TRACER is not set
@@ -2090,6 +2114,7 @@ CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_PRINTER=m
CONFIG_PRINTK_TIME=y
CONFIG_PRINT_QUOTA_WARNING=y
+# CONFIG_PRISM2_USB is not set
CONFIG_PRISM54=m
# CONFIG_PROCESSOR_SELECT is not set
CONFIG_PROC_KCORE=y
@@ -2167,6 +2192,8 @@ CONFIG_RPCSEC_GSS_SPKM3=m
CONFIG_RT2400PCI=m
CONFIG_RT2500PCI=m
CONFIG_RT2500USB=m
+# CONFIG_RT2860 is not set
+# CONFIG_RT2870 is not set
CONFIG_RT2X00=m
# CONFIG_RT2X00_DEBUG is not set
CONFIG_RT2X00_LIB=m
@@ -2177,6 +2204,7 @@ CONFIG_RT2X00_LIB_LEDS=y
CONFIG_RT2X00_LIB_PCI=m
CONFIG_RT2X00_LIB_RFKILL=y
CONFIG_RT2X00_LIB_USB=m
+# CONFIG_RT3070 is not set
CONFIG_RT61PCI=m
CONFIG_RT73USB=m
# CONFIG_RTC_DRV_BQ4802 is not set
@@ -2211,6 +2239,7 @@ CONFIG_RTC_DRV_V3020=m
CONFIG_RTC_DRV_X1205=m
CONFIG_RTL8180=m
CONFIG_RTL8187=m
+# CONFIG_RTL8187SE is not set
CONFIG_RT_GROUP_SCHED=y
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
@@ -2495,6 +2524,7 @@ CONFIG_SKISA=m
CONFIG_SKY2=m
# CONFIG_SKY2_DEBUG is not set
CONFIG_SLHC=m
+# CONFIG_SLICOSS is not set
CONFIG_SLIP=m
CONFIG_SLIP_COMPRESSED=y
CONFIG_SLIP_MODE_SLIP6=y
@@ -2673,10 +2703,10 @@ CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
CONFIG_SSB_SPROM=y
CONFIG_SSFDC=m
CONFIG_STACKTRACE=y
-# CONFIG_STAGING is not set
CONFIG_STALDRV=y
# CONFIG_STALLION is not set
# CONFIG_STANDALONE is not set
+# CONFIG_STLC45XX is not set
CONFIG_STOP_MACHINE=y
CONFIG_STP=m
CONFIG_STRICT_DEVMEM=y
@@ -2689,6 +2719,7 @@ CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUN_PARTITION=y
CONFIG_SX=m
+# CONFIG_SXG is not set
CONFIG_SYNCLINK=m
CONFIG_SYNCLINKMP=m
CONFIG_SYNCLINK_CS=m
@@ -2794,6 +2825,7 @@ CONFIG_TR=y
CONFIG_TRACEPOINTS=y
CONFIG_TRACER_MAX_TRACE=y
CONFIG_TRACING=y
+# CONFIG_TRANZPORT is not set
CONFIG_TTPCI_EEPROM=m
CONFIG_TULIP=m
# CONFIG_TULIP_MMIO is not set
@@ -2837,6 +2869,7 @@ CONFIG_USB_APPLEIR=m
CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_ATMEL is not set
CONFIG_USB_BELKIN=y
CONFIG_USB_BERRY_CHARGE=m
CONFIG_USB_C67X00_HCD=m
@@ -2888,6 +2921,7 @@ CONFIG_USB_HSO=m
CONFIG_USB_IBMCAM=m
CONFIG_USB_IDMOUSE=m
CONFIG_USB_IOWARRIOR=m
+# CONFIG_USB_IP_COMMON is not set
CONFIG_USB_IRDA=m
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_ISP116X_HCD=m
@@ -2940,6 +2974,7 @@ CONFIG_USB_SE401=m
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
+# CONFIG_USB_SERIAL_ATEN2011 is not set
CONFIG_USB_SERIAL_BELKIN=m
CONFIG_USB_SERIAL_CH341=m
CONFIG_USB_SERIAL_CP210X=m
@@ -2986,6 +3021,7 @@ CONFIG_USB_SERIAL_OPTION=m
CONFIG_USB_SERIAL_OTI6858=m
CONFIG_USB_SERIAL_PL2303=m
CONFIG_USB_SERIAL_QUALCOMM=m
+# CONFIG_USB_SERIAL_QUATECH_ESU100 is not set
CONFIG_USB_SERIAL_SAFE=m
# CONFIG_USB_SERIAL_SAFE_PADDED is not set
CONFIG_USB_SERIAL_SIEMENS_MPI=m
@@ -3083,6 +3119,7 @@ CONFIG_VIDEO_EM28XX=m
CONFIG_VIDEO_EM28XX_ALSA=m
CONFIG_VIDEO_EM28XX_DVB=m
CONFIG_VIDEO_FB_IVTV=m
+# CONFIG_VIDEO_GO7007 is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
CONFIG_VIDEO_HEXIUM_GEMINI=m
CONFIG_VIDEO_HEXIUM_ORION=m
@@ -3173,6 +3210,7 @@ CONFIG_W1_SLAVE_DS2433=m
CONFIG_W1_SLAVE_DS2760=m
CONFIG_W1_SLAVE_SMEM=m
CONFIG_W1_SLAVE_THERM=m
+# CONFIG_W35UND is not set
CONFIG_W83627HF_WDT=m
CONFIG_W83697HF_WDT=m
# CONFIG_W83697UG_WDT is not set
--
1.6.3.rc3.199.g24398
More information about the kernel-team
mailing list