[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [kernel] r15186 - in dists/trunk/linux-2.6/debian/patches: debian features/all/speakup



On Thu, Feb 18, 2010 at 01:49:34PM +0000, Ben Hutchings wrote:
>   Kconfig := $(KBUILD_KCONFIG)
> -@@ -26,10 +26,16 @@ config: $(obj)/conf
> +@@ -26,9 +26,15 @@ config: $(obj)/conf
>   oldconfig: $(obj)/conf
>   	$< -o $(Kconfig)
>   
> @@ -19,7 +19,6 @@
>  +	$< -R $(Kconfig)
>  +
>   silentoldconfig: $(obj)/conf
> - 	$(Q)mkdir -p include/generated
>   	$< -s $(Kconfig)
>   
>  +updateoldconfig: $(obj)/conf

aboves is need afais.
 
> Modified: dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch
> ==============================================================================
> --- dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch	Thu Feb 18 13:22:31 2010	(r15185)
> +++ dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch	Thu Feb 18 13:49:31 2010	(r15186)
> @@ -3,10 +3,10 @@
>  
>  --- a/drivers/staging/Kconfig
>  +++ b/drivers/staging/Kconfig
> -@@ -126,6 +126,8 @@
> - source "drivers/staging/netwave/Kconfig"
> +@@ -124,6 +124,8 @@
> + source "drivers/staging/sep/Kconfig"
>   
> - source "drivers/staging/sm7xx/Kconfig"
> + source "drivers/staging/iio/Kconfig"
>  +
>  +source "drivers/staging/speakup/Kconfig"
>   
> @@ -14,10 +14,10 @@
>   endif # STAGING
>  --- a/drivers/staging/Makefile
>  +++ b/drivers/staging/Makefile
> -@@ -45,3 +45,4 @@
> - obj-$(CONFIG_PCMCIA_WAVELAN)	+= wavelan/
> - obj-$(CONFIG_PCMCIA_NETWAVE)	+= netwave/
> - obj-$(CONFIG_FB_SM7XX)		+= sm7xx/
> +@@ -44,3 +44,4 @@
> + obj-$(CONFIG_RAR_REGISTER)	+= rar/
> + obj-$(CONFIG_DX_SEP)		+= sep/
> + obj-$(CONFIG_IIO)		+= iio/
>  +obj-$(CONFIG_SPEAKUP)		+= speakup/
>  --- a/drivers/staging/speakup/Kbuild
>  +++ b/drivers/staging/speakup/Kbuild

why this revert? can't apply anymore too?


Reply to: