[PATCH] missing ifdef in mod_devicetable.h for 2.6.14-rc3

[PATCH] missing ifdef in mod_devicetable.h for 2.6.14-rc3

[Alex Romosan]

this was introduced in rc1 and is still present in rc3. without the
patch below i can't compile alsa cvs.

--- a/include/linux/mod_devicetable.h	2005-09-13 13:49:17.000000000 -0700
+++ b/include/linux/mod_devicetable.h	2005-09-13 13:49:43.000000000 -0700
@@ -183,7 +183,7 @@
 	char	name[32];
 	char	type[32];
 	char	compatible[128];
-#if __KERNEL__
+#ifdef __KERNEL__
 	void	*data;
 #else
 	kernel_ulong_t data;

--alex--

-- 
| I believe the moment is at hand when, by a paranoiac and active |
|  advance of the mind, it will be possible (simultaneously with  |
|  automatism and other passive states) to systematize confusion  |
|  and thus to help to discredit completely the world of reality. |

Re: [PATCH] missing ifdef in mod_devicetable.h for 2.6.14-rc3

[Arjan van de Ven]

On Sat, 2005-10-01 at 08:03 -0700, Alex Romosan wrote:
> this was introduced in rc1 and is still present in rc3. without the
> patch below i can't compile alsa cvs.


while our patch isn't wrong... makes me wonder if alsa cvs has a bug in
their makefiles ...

Re: [PATCH] missing ifdef in mod_devicetable.h for 2.6.14-rc3

[Alex Romosan]

Arjan van de Ven <arjan@infradead.org> writes:

> On Sat, 2005-10-01 at 08:03 -0700, Alex Romosan wrote:
>> this was introduced in rc1 and is still present in rc3. without the
>> patch below i can't compile alsa cvs.
>
>
> while our patch isn't wrong... makes me wonder if alsa cvs has a bug in
> their makefiles ...
>

well, it could be that their check is wrong:

AC_TRY_COMPILE([
#define __KERNEL__
#include <linux/config.h>
#include <linux/pci.h>
],[
        int (*func)();
        func = pci_set_consistent_dma_mask;
],
    AC_MSG_RESULT("yes");pci_consistent_defined="1",
    AC_MSG_RESULT("no");pci_consistent_defined="0",
    AC_MSG_RESULT("unknown");pci_consistent_defined="0"
)

notice the '#define __KERNEL__'. this gives:

/usr/src/linux/include/linux/mod_devicetable.h:186:15: error: #if with no expression

replacing the above with '#define __KERNEL__ 1' (there and in a
million other places where this happens) solves the problem.

--alex--

-- 
| I believe the moment is at hand when, by a paranoiac and active |
|  advance of the mind, it will be possible (simultaneously with  |
|  automatism and other passive states) to systematize confusion  |
|  and thus to help to discredit completely the world of reality. |