* [patch][resend] pcspkr: fix dependancies
@ 2008-05-04 4:22 Stas Sergeev
2008-05-05 3:57 ` Dmitry Torokhov
0 siblings, 1 reply; 8+ messages in thread
From: Stas Sergeev @ 2008-05-04 4:22 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Takashi Iwai, Linux kernel, Vojtech Pavlik, Michael Opdenacker,
Thomas Gleixner
[-- Attachment #1: Type: text/plain, Size: 601 bytes --]
Thomas Gleixner wrote:
> The input changes need to go via Dimitry, the x86 part can go in the
> same commit.
> Acked-by: Thomas Gleixner <tglx@linutronix.de>
Dmitry, would you mind applying this one?
If not, then I see no way to get either
fix applied...
---
fix pcspkr dependancies: make the pcspkr platform
drivers to depend on a platform device, and
not the other way around.
Signed-off-by: Stas Sergeev <stsp@aknet.ru>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
CC: Vojtech Pavlik <vojtech@suse.cz>
CC: Michael Opdenacker <michael-lists@free-electrons.com>
CC: Takashi Iwai <tiwai@suse.de>
[-- Attachment #2: pcsp_dep2.diff --]
[-- Type: text/x-patch, Size: 1315 bytes --]
--- a/init/Kconfig 2008-04-26 13:40:20.000000000 +0400
+++ b/init/Kconfig 2008-04-26 18:20:40.000000000 +0400
@@ -624,6 +624,14 @@
help
Enable support for generating core dumps. Disabling saves about 4k.
+config PCSPKR_PLATFORM
+ bool "Enable PC-Speaker support" if EMBEDDED
+ depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+ default y
+ help
+ This option allows to disable the internal PC-Speaker
+ support, saving some memory.
+
config COMPAT_BRK
bool "Disable heap randomization"
default y
--- a/arch/x86/kernel/Makefile 2008-04-26 13:40:06.000000000 +0400
+++ b/arch/x86/kernel/Makefile 2008-04-26 18:22:49.000000000 +0400
@@ -83,7 +83,7 @@
obj-$(CONFIG_VMI) += vmi_32.o vmiclock_32.o
obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o
-ifdef CONFIG_INPUT_PCSPKR
+ifdef CONFIG_PCSPKR_PLATFORM
obj-y += pcspeaker.o
endif
--- a/drivers/input/misc/Kconfig 2008-04-22 20:50:41.000000000 +0400
+++ b/drivers/input/misc/Kconfig 2008-04-26 18:23:32.000000000 +0400
@@ -14,7 +14,7 @@
config INPUT_PCSPKR
tristate "PC Speaker support"
- depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+ depends on PCSPKR_PLATFORM
help
Say Y here if you want the standard PC Speaker to be used for
bells and whistles.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch][resend] pcspkr: fix dependancies
2008-05-04 4:22 [patch][resend] pcspkr: fix dependancies Stas Sergeev
@ 2008-05-05 3:57 ` Dmitry Torokhov
2008-05-05 4:26 ` Stas Sergeev
0 siblings, 1 reply; 8+ messages in thread
From: Dmitry Torokhov @ 2008-05-05 3:57 UTC (permalink / raw)
To: Stas Sergeev
Cc: Takashi Iwai, Linux kernel, Vojtech Pavlik, Michael Opdenacker,
Thomas Gleixner
On Sun, May 04, 2008 at 08:22:32AM +0400, Stas Sergeev wrote:
> Thomas Gleixner wrote:
> > The input changes need to go via Dimitry, the x86 part can go in the
> > same commit.
> > Acked-by: Thomas Gleixner <tglx@linutronix.de>
> Dmitry, would you mind applying this one?
> If not, then I see no way to get either
> fix applied...
>
Ok, but don't you need to also add the same dependancy for SND_PCSP?
--
Dmitry
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch][resend] pcspkr: fix dependancies
2008-05-05 3:57 ` Dmitry Torokhov
@ 2008-05-05 4:26 ` Stas Sergeev
2008-05-05 4:35 ` Dmitry Torokhov
0 siblings, 1 reply; 8+ messages in thread
From: Stas Sergeev @ 2008-05-05 4:26 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Takashi Iwai, Linux kernel, Vojtech Pavlik, Michael Opdenacker,
Thomas Gleixner
Hello.
Dmitry Torokhov wrote:
>> Dmitry, would you mind applying this one?
>> If not, then I see no way to get either
>> fix applied...
> Ok, but don't you need to also add the same dependancy for SND_PCSP?
Thanks!
As for SND_PCSP - I decided to skip
that part and send it as a separate
patch to Takashi, when this one is
settled. Otherwise it would be even
more difficult to find the right person
to apply the whole thing. :)
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch][resend] pcspkr: fix dependancies
2008-05-05 4:26 ` Stas Sergeev
@ 2008-05-05 4:35 ` Dmitry Torokhov
2008-05-05 5:02 ` [patch][resend2] " Stas Sergeev
0 siblings, 1 reply; 8+ messages in thread
From: Dmitry Torokhov @ 2008-05-05 4:35 UTC (permalink / raw)
To: Stas Sergeev
Cc: Takashi Iwai, Linux kernel, Vojtech Pavlik, Michael Opdenacker,
Thomas Gleixner
On Mon, May 05, 2008 at 08:26:12AM +0400, Stas Sergeev wrote:
> Hello.
>
> Dmitry Torokhov wrote:
> >> Dmitry, would you mind applying this one?
> >> If not, then I see no way to get either
> >> fix applied...
> > Ok, but don't you need to also add the same dependancy for SND_PCSP?
> Thanks!
> As for SND_PCSP - I decided to skip
> that part and send it as a separate
> patch to Takashi, when this one is
> settled. Otherwise it would be even
> more difficult to find the right person
> to apply the whole thing. :)
Why don't we ask Takashi to apply it in one step? You can add my
Acked-by: Dmitry Torokhov <dtor@mail.ru>
--
Dmitry
^ permalink raw reply [flat|nested] 8+ messages in thread
* [patch][resend2] pcspkr: fix dependancies
2008-05-05 4:35 ` Dmitry Torokhov
@ 2008-05-05 5:02 ` Stas Sergeev
2008-05-05 11:02 ` Takashi Iwai
0 siblings, 1 reply; 8+ messages in thread
From: Stas Sergeev @ 2008-05-05 5:02 UTC (permalink / raw)
To: Takashi Iwai
Cc: Dmitry Torokhov, Linux kernel, Vojtech Pavlik, Michael Opdenacker,
Thomas Gleixner
[-- Attachment #1: Type: text/plain, Size: 544 bytes --]
Hello.
Dmitry Torokhov wrote:
> Why don't we ask Takashi to apply it in one step? You can add my
> Acked-by: Dmitry Torokhov <dtor@mail.ru>
OK, lets do. :)
Takashi, could you please apply?
---
fix pcspkr dependancies: make the pcspkr platform
drivers to depend on a platform device, and
not the other way around.
Signed-off-by: Stas Sergeev <stsp@aknet.ru>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
CC: Vojtech Pavlik <vojtech@suse.cz>
CC: Michael Opdenacker <michael-lists@free-electrons.com>
[-- Attachment #2: pcsp_dep.diff --]
[-- Type: text/x-patch, Size: 1797 bytes --]
--- a/init/Kconfig 2008-04-26 13:40:20.000000000 +0400
+++ b/init/Kconfig 2008-04-26 18:20:40.000000000 +0400
@@ -624,6 +624,14 @@
help
Enable support for generating core dumps. Disabling saves about 4k.
+config PCSPKR_PLATFORM
+ bool "Enable PC-Speaker support" if EMBEDDED
+ depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+ default y
+ help
+ This option allows to disable the internal PC-Speaker
+ support, saving some memory.
+
config COMPAT_BRK
bool "Disable heap randomization"
default y
--- a/arch/x86/kernel/Makefile 2008-04-26 13:40:06.000000000 +0400
+++ b/arch/x86/kernel/Makefile 2008-04-26 18:22:49.000000000 +0400
@@ -83,7 +83,7 @@
obj-$(CONFIG_VMI) += vmi_32.o vmiclock_32.o
obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o
-ifdef CONFIG_INPUT_PCSPKR
+ifdef CONFIG_PCSPKR_PLATFORM
obj-y += pcspeaker.o
endif
--- a/sound/drivers/Kconfig 2008-04-26 13:40:21.000000000 +0400
+++ b/sound/drivers/Kconfig 2008-04-26 18:24:59.000000000 +0400
@@ -5,8 +5,8 @@
config SND_PCSP
- tristate "Internal PC speaker support"
- depends on X86_PC && HIGH_RES_TIMERS
+ tristate "PC-Speaker support"
+ depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS
help
If you don't have a sound card in your computer, you can include a
driver for the PC speaker which allows it to act like a primitive
--- a/drivers/input/misc/Kconfig 2008-04-22 20:50:41.000000000 +0400
+++ b/drivers/input/misc/Kconfig 2008-04-26 18:23:32.000000000 +0400
@@ -14,7 +14,7 @@
config INPUT_PCSPKR
tristate "PC Speaker support"
- depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+ depends on PCSPKR_PLATFORM
help
Say Y here if you want the standard PC Speaker to be used for
bells and whistles.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch][resend2] pcspkr: fix dependancies
2008-05-05 5:02 ` [patch][resend2] " Stas Sergeev
@ 2008-05-05 11:02 ` Takashi Iwai
2008-05-08 17:50 ` [patch] " Stas Sergeev
0 siblings, 1 reply; 8+ messages in thread
From: Takashi Iwai @ 2008-05-05 11:02 UTC (permalink / raw)
To: Stas Sergeev
Cc: Dmitry Torokhov, Linux kernel, Vojtech Pavlik, Michael Opdenacker,
Thomas Gleixner
At Mon, 05 May 2008 09:02:38 +0400,
Stas Sergeev wrote:
>
> --- a/arch/x86/kernel/Makefile 2008-04-26 13:40:06.000000000 +0400
> +++ b/arch/x86/kernel/Makefile 2008-04-26 18:22:49.000000000 +0400
> @@ -83,7 +83,7 @@
> obj-$(CONFIG_VMI) += vmi_32.o vmiclock_32.o
> obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o
>
> -ifdef CONFIG_INPUT_PCSPKR
> +ifdef CONFIG_PCSPKR_PLATFORM
> obj-y += pcspeaker.o
> endif
This could be replaced now better with
obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o
without if-endif since CONFIG_PCSPKR_PLATFORM is a bool.
> --- a/sound/drivers/Kconfig 2008-04-26 13:40:21.000000000 +0400
> +++ b/sound/drivers/Kconfig 2008-04-26 18:24:59.000000000 +0400
> @@ -5,8 +5,8 @@
>
>
> config SND_PCSP
> - tristate "Internal PC speaker support"
> - depends on X86_PC && HIGH_RES_TIMERS
> + tristate "PC-Speaker support"
> + depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS
> help
> If you don't have a sound card in your computer, you can include a
> driver for the PC speaker which allows it to act like a primitive
> --- a/drivers/input/misc/Kconfig 2008-04-22 20:50:41.000000000 +0400
> +++ b/drivers/input/misc/Kconfig 2008-04-26 18:23:32.000000000 +0400
> @@ -14,7 +14,7 @@
>
> config INPUT_PCSPKR
> tristate "PC Speaker support"
> - depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
> + depends on PCSPKR_PLATFORM
> help
> Say Y here if you want the standard PC Speaker to be used for
> bells and whistles.
These two chunks don't apply on 2.6.26-git tree. Please recreate the
patch.
thanks,
Takashi
^ permalink raw reply [flat|nested] 8+ messages in thread
* [patch] pcspkr: fix dependancies
2008-05-05 11:02 ` Takashi Iwai
@ 2008-05-08 17:50 ` Stas Sergeev
2008-05-08 13:58 ` Takashi Iwai
0 siblings, 1 reply; 8+ messages in thread
From: Stas Sergeev @ 2008-05-08 17:50 UTC (permalink / raw)
To: Takashi Iwai
Cc: Dmitry Torokhov, Linux kernel, Vojtech Pavlik, Michael Opdenacker,
Thomas Gleixner
[-- Attachment #1: Type: text/plain, Size: 582 bytes --]
Hello.
Takashi Iwai wrote:
> This could be replaced now better with
> obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o
> These two chunks don't apply on 2.6.26-git tree. Please recreate the
> patch.
Done.
Could you please apply?
---
fix pcspkr dependancies: make the pcspkr platform
drivers to depend on a platform device, and
not the other way around.
Signed-off-by: Stas Sergeev <stsp@aknet.ru>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
CC: Vojtech Pavlik <vojtech@suse.cz>
CC: Michael Opdenacker <michael-lists@free-electrons.com>
[-- Attachment #2: pcsp_dep3.diff --]
[-- Type: text/x-patch, Size: 1728 bytes --]
--- a/init/Kconfig 2008-04-26 13:40:20.000000000 +0400
+++ b/init/Kconfig 2008-04-26 18:20:40.000000000 +0400
@@ -634,6 +634,14 @@
help
Enable support for generating core dumps. Disabling saves about 4k.
+config PCSPKR_PLATFORM
+ bool "Enable PC-Speaker support" if EMBEDDED
+ depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+ default y
+ help
+ This option allows to disable the internal PC-Speaker
+ support, saving some memory.
+
config COMPAT_BRK
bool "Disable heap randomization"
default y
--- a/arch/x86/kernel/Makefile 2008-04-26 13:40:06.000000000 +0400
+++ b/arch/x86/kernel/Makefile 2008-04-26 18:22:49.000000000 +0400
@@ -83,9 +83,7 @@
obj-$(CONFIG_KVM_CLOCK) += kvmclock.o
obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o
-ifdef CONFIG_INPUT_PCSPKR
-obj-y += pcspeaker.o
-endif
+obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o
obj-$(CONFIG_SCx200) += scx200.o
scx200-y += scx200_32.o
--- a/sound/drivers/Kconfig 2008-04-26 13:40:21.000000000 +0400
+++ b/sound/drivers/Kconfig 2008-04-26 18:24:59.000000000 +0400
@@ -5,7 +5,8 @@
config SND_PCSP
- tristate "Internal PC speaker support"
+ tristate "PC-Speaker support"
+ depends on PCSPKR_PLATFORM
depends on X86_PC && HIGH_RES_TIMERS
depends on INPUT
depends on SND
--- a/drivers/input/misc/Kconfig 2008-04-22 20:50:41.000000000 +0400
+++ b/drivers/input/misc/Kconfig 2008-04-26 18:23:32.000000000 +0400
@@ -14,7 +14,7 @@
config INPUT_PCSPKR
tristate "PC Speaker support"
- depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+ depends on PCSPKR_PLATFORM
depends on SND_PCSP=n
help
Say Y here if you want the standard PC Speaker to be used for
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [patch] pcspkr: fix dependancies
2008-05-08 17:50 ` [patch] " Stas Sergeev
@ 2008-05-08 13:58 ` Takashi Iwai
0 siblings, 0 replies; 8+ messages in thread
From: Takashi Iwai @ 2008-05-08 13:58 UTC (permalink / raw)
To: Stas Sergeev
Cc: Dmitry Torokhov, Linux kernel, Vojtech Pavlik, Michael Opdenacker,
Thomas Gleixner
At Thu, 08 May 2008 21:50:03 +0400,
Stas Sergeev wrote:
>
> Hello.
>
> Takashi Iwai wrote:
> > This could be replaced now better with
> > obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o
> > These two chunks don't apply on 2.6.26-git tree. Please recreate the
> > patch.
> Done.
> Could you please apply?
Ah sorry, forgot to follow up that I had already fixed and applied
your patch to my git tree. Since it passed some build tests, I'll
submit the pull request soon later.
thanks,
Takashi
>
> ---
> fix pcspkr dependancies: make the pcspkr platform
> drivers to depend on a platform device, and
> not the other way around.
>
> Signed-off-by: Stas Sergeev <stsp@aknet.ru>
> Acked-by: Thomas Gleixner <tglx@linutronix.de>
> Acked-by: Dmitry Torokhov <dtor@mail.ru>
> CC: Vojtech Pavlik <vojtech@suse.cz>
> CC: Michael Opdenacker <michael-lists@free-electrons.com>
> [2 pcsp_dep3.diff <text/x-patch (7bit)>]
> --- a/init/Kconfig 2008-04-26 13:40:20.000000000 +0400
> +++ b/init/Kconfig 2008-04-26 18:20:40.000000000 +0400
> @@ -634,6 +634,14 @@
> help
> Enable support for generating core dumps. Disabling saves about 4k.
>
> +config PCSPKR_PLATFORM
> + bool "Enable PC-Speaker support" if EMBEDDED
> + depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
> + default y
> + help
> + This option allows to disable the internal PC-Speaker
> + support, saving some memory.
> +
> config COMPAT_BRK
> bool "Disable heap randomization"
> default y
> --- a/arch/x86/kernel/Makefile 2008-04-26 13:40:06.000000000 +0400
> +++ b/arch/x86/kernel/Makefile 2008-04-26 18:22:49.000000000 +0400
> @@ -83,9 +83,7 @@
> obj-$(CONFIG_KVM_CLOCK) += kvmclock.o
> obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o
>
> -ifdef CONFIG_INPUT_PCSPKR
> -obj-y += pcspeaker.o
> -endif
> +obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o
>
> obj-$(CONFIG_SCx200) += scx200.o
> scx200-y += scx200_32.o
> --- a/sound/drivers/Kconfig 2008-04-26 13:40:21.000000000 +0400
> +++ b/sound/drivers/Kconfig 2008-04-26 18:24:59.000000000 +0400
> @@ -5,7 +5,8 @@
>
>
> config SND_PCSP
> - tristate "Internal PC speaker support"
> + tristate "PC-Speaker support"
> + depends on PCSPKR_PLATFORM
> depends on X86_PC && HIGH_RES_TIMERS
> depends on INPUT
> depends on SND
> --- a/drivers/input/misc/Kconfig 2008-04-22 20:50:41.000000000 +0400
> +++ b/drivers/input/misc/Kconfig 2008-04-26 18:23:32.000000000 +0400
> @@ -14,7 +14,7 @@
>
> config INPUT_PCSPKR
> tristate "PC Speaker support"
> - depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
> + depends on PCSPKR_PLATFORM
> depends on SND_PCSP=n
> help
> Say Y here if you want the standard PC Speaker to be used for
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2008-05-08 14:08 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-04 4:22 [patch][resend] pcspkr: fix dependancies Stas Sergeev
2008-05-05 3:57 ` Dmitry Torokhov
2008-05-05 4:26 ` Stas Sergeev
2008-05-05 4:35 ` Dmitry Torokhov
2008-05-05 5:02 ` [patch][resend2] " Stas Sergeev
2008-05-05 11:02 ` Takashi Iwai
2008-05-08 17:50 ` [patch] " Stas Sergeev
2008-05-08 13:58 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox