Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 84452 Details for
Bug 124301
splashutils-1.1.9.10 emerge fails with various errors (kernel 2.6.16)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
incomplete patch
patch2 (text/plain), 5.77 KB, created by
Daniel Drake (RETIRED)
on 2006-04-11 09:53:07 UTC
(
hide
)
Description:
incomplete patch
Filename:
MIME Type:
Creator:
Daniel Drake (RETIRED)
Created:
2006-04-11 09:53:07 UTC
Size:
5.77 KB
patch
obsolete
>--- linux-2.6.16/include/linux/input.h.orig 2006-04-11 17:32:54.000000000 +0100 >+++ linux-2.6.16/include/linux/input.h 2006-04-11 17:52:46.000000000 +0100 >@@ -13,12 +13,12 @@ > #include <linux/time.h> > #include <linux/list.h> > #include <linux/device.h> >-#include <linux/mod_devicetable.h> > #else > #include <sys/time.h> > #include <sys/ioctl.h> > #include <asm/types.h> > #endif >+#include <linux/mod_devicetable.h> > > /* > * The event structure itself >@@ -41,13 +41,6 @@ struct input_event { > * IOCTLs (0x00 - 0x7f) > */ > >-struct input_id { >- __u16 bustype; >- __u16 vendor; >- __u16 product; >- __u16 version; >-}; >- > struct input_absinfo { > __s32 value; > __s32 minimum; >@@ -796,25 +789,6 @@ struct ff_effect { > > #define FF_MAX 0x7f > >-struct input_device_id { >- >- kernel_ulong_t flags; >- >- struct input_id id; >- >- kernel_ulong_t evbit[EV_MAX/BITS_PER_LONG+1]; >- kernel_ulong_t keybit[KEY_MAX/BITS_PER_LONG+1]; >- kernel_ulong_t relbit[REL_MAX/BITS_PER_LONG+1]; >- kernel_ulong_t absbit[ABS_MAX/BITS_PER_LONG+1]; >- kernel_ulong_t mscbit[MSC_MAX/BITS_PER_LONG+1]; >- kernel_ulong_t ledbit[LED_MAX/BITS_PER_LONG+1]; >- kernel_ulong_t sndbit[SND_MAX/BITS_PER_LONG+1]; >- kernel_ulong_t ffbit[FF_MAX/BITS_PER_LONG+1]; >- kernel_ulong_t swbit[SW_MAX/BITS_PER_LONG+1]; >- >- kernel_ulong_t driver_info; >-}; >- > /* > * Structure for hotplug & device<->driver matching. > */ >--- linux-2.6.16/include/linux/mod_devicetable.h.orig 2006-04-11 17:33:02.000000000 +0100 >+++ linux-2.6.16/include/linux/mod_devicetable.h 2006-04-11 17:52:49.000000000 +0100 >@@ -249,4 +249,31 @@ struct i2c_device_id { > __u16 id; > }; > >+/* Input */ >+struct input_id { >+ __u16 bustype; >+ __u16 vendor; >+ __u16 product; >+ __u16 version; >+}; >+ >+struct input_device_id { >+ >+ kernel_ulong_t flags; >+ >+ struct input_id id; >+ >+ kernel_ulong_t evbit[EV_MAX/BITS_PER_LONG+1]; >+ kernel_ulong_t keybit[KEY_MAX/BITS_PER_LONG+1]; >+ kernel_ulong_t relbit[REL_MAX/BITS_PER_LONG+1]; >+ kernel_ulong_t absbit[ABS_MAX/BITS_PER_LONG+1]; >+ kernel_ulong_t mscbit[MSC_MAX/BITS_PER_LONG+1]; >+ kernel_ulong_t ledbit[LED_MAX/BITS_PER_LONG+1]; >+ kernel_ulong_t sndbit[SND_MAX/BITS_PER_LONG+1]; >+ kernel_ulong_t ffbit[FF_MAX/BITS_PER_LONG+1]; >+ kernel_ulong_t swbit[SW_MAX/BITS_PER_LONG+1]; >+ >+ kernel_ulong_t driver_info; >+}; >+ > #endif /* LINUX_MOD_DEVICETABLE_H */ >--- linux-2.6.16/drivers/char/keyboard.c.orig 2006-04-11 17:35:17.000000000 +0100 >+++ linux-2.6.16/drivers/char/keyboard.c 2006-04-11 17:35:19.000000000 +0100 >@@ -39,6 +39,7 @@ > #include <linux/vt_kern.h> > #include <linux/sysrq.h> > #include <linux/input.h> >+#include <linux/mod_devicetable.h> > > static void kbd_disconnect(struct input_handle *handle); > extern void ctrl_alt_del(void); >--- linux-2.6.16/drivers/input/joydev.c.orig 2006-04-11 17:36:10.000000000 +0100 >+++ linux-2.6.16/drivers/input/joydev.c 2006-04-11 17:36:26.000000000 +0100 >@@ -26,6 +26,7 @@ > #include <linux/init.h> > #include <linux/smp_lock.h> > #include <linux/device.h> >+#include <linux/mod_devicetable.h> > > MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); > MODULE_DESCRIPTION("Joystick device interfaces"); >--- linux-2.6.16/drivers/input/power.c.orig 2006-04-11 17:37:35.000000000 +0100 >+++ linux-2.6.16/drivers/input/power.c 2006-04-11 17:38:26.000000000 +0100 >@@ -35,6 +35,7 @@ > #include <linux/tty.h> > #include <linux/delay.h> > #include <linux/pm.h> >+#include <linux/mod_devicetable.h> > > static struct input_handler power_handler; > >--- linux-2.6.16/drivers/input/evdev.c.orig 2006-04-11 17:37:41.000000000 +0100 >+++ linux-2.6.16/drivers/input/evdev.c 2006-04-11 17:38:38.000000000 +0100 >@@ -21,6 +21,7 @@ > #include <linux/smp_lock.h> > #include <linux/device.h> > #include <linux/compat.h> >+#include <linux/mod_devicetable.h> > > struct evdev { > int exist; >--- linux-2.6.16/drivers/input/input.c.orig 2006-04-11 17:37:45.000000000 +0100 >+++ linux-2.6.16/drivers/input/input.c 2006-04-11 17:38:56.000000000 +0100 >@@ -21,6 +21,7 @@ > #include <linux/interrupt.h> > #include <linux/poll.h> > #include <linux/device.h> >+#include <linux/mod_devicetable.h> > > MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>"); > MODULE_DESCRIPTION("Input core"); >--- linux-2.6.16/drivers/input/evbug.c.orig 2006-04-11 17:37:49.000000000 +0100 >+++ linux-2.6.16/drivers/input/evbug.c 2006-04-11 17:39:10.000000000 +0100 >@@ -33,6 +33,7 @@ > #include <linux/input.h> > #include <linux/init.h> > #include <linux/device.h> >+#include <linux/mod_devicetable.h> > > MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); > MODULE_DESCRIPTION("Input driver event debug module"); >--- linux-2.6.16/drivers/input/mousedev.c.orig 2006-04-11 17:37:57.000000000 +0100 >+++ linux-2.6.16/drivers/input/mousedev.c 2006-04-11 17:39:25.000000000 +0100 >@@ -24,6 +24,7 @@ > #include <linux/random.h> > #include <linux/major.h> > #include <linux/device.h> >+#include <linux/mod_devicetable.h> > #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX > #include <linux/miscdevice.h> > #endif >--- linux-2.6.16/drivers/input/tsdev.c.orig 2006-04-11 17:38:04.000000000 +0100 >+++ linux-2.6.16/drivers/input/tsdev.c 2006-04-11 17:39:39.000000000 +0100 >@@ -53,6 +53,7 @@ > #include <linux/random.h> > #include <linux/time.h> > #include <linux/device.h> >+#include <linux/mod_devicetable.h> > > #ifndef CONFIG_INPUT_TSDEV_SCREEN_X > #define CONFIG_INPUT_TSDEV_SCREEN_X 240 >--- linux-2.6.16/include/linux/usb_input.h.orig 2006-04-11 17:53:29.000000000 +0100 >+++ linux-2.6.16/include/linux/usb_input.h 2006-04-11 17:55:03.000000000 +0100 >@@ -10,7 +10,7 @@ > */ > > #include <linux/usb.h> >-#include <linux/input.h> >+#include <linux/mod_devicetable.h> > #include <asm/byteorder.h> > > static inline void >--- linux-2.6.16/include/linux/uinput.h.orig 2006-04-11 17:55:16.000000000 +0100 >+++ linux-2.6.16/include/linux/uinput.h 2006-04-11 17:56:38.000000000 +0100 >@@ -28,6 +28,7 @@ > * 0.1 20/06/2002 > * - first public version > */ >+#include <linux/mod_devicetable.h> > #ifdef __KERNEL__ > #define UINPUT_MINOR 223 > #define UINPUT_NAME "uinput"
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 124301
:
82718
|
83711
|
84452
|
84477