linux/drivers at 3856d30ded1fe43c6657927ebad402d25cd128f4 - linux - Nytegear Gitea

mirrors/linux

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-07 13:33:08 -05:00

Files

History

Linus Torvalds f3161f36f5 pcc-acpi: fix compile with new stricter ACPI types

This was another merge problem that wasn't a data conflict, but due to
independent changes in two branches that just didn't work together.

The pcc-acpi staging driver used

	acpi_driver_data(device) = hotkey;

to set driver data, but the ACPI merge made that invalid in commit
db89b4f0db ("ACPI: catch calls of
acpi_driver_data on pointer of wrong type"), and now you're supposed to
just do.

	device->driver_data = hotkey;

instead.

Fix it up.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2008-10-23 11:54:08 -07:00

..

braille_console: only register notifiers when the braille console is used

2008-10-02 15:53:13 -07:00

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2008-10-23 10:20:36 -07:00

…

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2008-10-23 10:20:36 -07:00

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-10-11 12:39:35 -07:00

…

memory_probe: fix wrong sysfs file attribute

2008-10-20 08:52:32 -07:00

[PATCH] sanitize blkdev_get() and friends

2008-10-21 07:49:06 -04:00

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

2008-10-13 14:12:40 -07:00

[PATCH] switch viocd

2008-10-21 07:48:21 -04:00

Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev

2008-10-23 10:23:07 -07:00

Merge branches 'timers/clocksource', 'timers/hrtimers', 'timers/nohz', 'timers/ntp', 'timers/posixtimers' and 'timers/debug' into v28-timers-for-linus

2008-10-20 13:14:06 +02:00

…

[CPUFREQ] Fix BUG: using smp_processor_id() in preemptible code

2008-10-09 13:52:44 -04:00

Merge branch 'v28-range-hrtimers-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2008-10-23 10:53:02 -07:00

crypto: talitos - Avoid consecutive packets going out with same IV

2008-09-14 13:41:19 -07:00

device create: misc: convert device_create_drvdata to device_create

2008-10-16 09:24:43 -07:00

…

Merge branch 'linus' into test

2008-10-23 00:11:07 -04:00

edac cell: fix incorrect edac_mode

2008-10-20 08:52:40 -07:00

…

firewire: fix ioctl() return code

2008-10-15 22:21:10 +02:00

x86: sysfs: kill owner field from attribute

2008-10-20 08:52:42 -07:00

mfd: twl4030-gpio driver

2008-10-22 01:19:39 +02:00

Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

2008-10-23 10:18:40 -07:00

USB: remove warn macro from HID core

2008-10-17 14:41:09 -07:00

hwmon: applesmc: lighter wait mechanism, drastic improvement

2008-10-20 08:52:35 -07:00

Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

2008-10-23 10:10:25 -07:00

Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev

2008-10-23 10:23:07 -07:00

i7300_idle driver v1.55

2008-10-21 23:58:41 -04:00

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

2008-10-16 15:02:24 -07:00

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

2008-10-23 08:16:03 -07:00

Merge branch 'for-next' of git://git.o-hand.com/linux-mfd

2008-10-20 09:22:47 -07:00

device create: misc: convert device_create_drvdata to device_create

2008-10-16 09:24:43 -07:00

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

2008-10-20 13:12:39 -07:00

lguest: update commentry

2008-08-26 00:19:28 +10:00

device create: misc: convert device_create_drvdata to device_create

2008-10-16 09:24:43 -07:00

…

Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev

2008-10-23 10:23:07 -07:00

V4L/DVB (9336): cx88: always de-alloc frontends on fault condition

2008-10-21 14:32:12 -02:00

[PATCH] switch memstick

2008-10-21 07:48:33 -04:00

[PATCH] switch i2o

2008-10-21 07:48:35 -04:00

mfd: check for platform_get_irq() return value in sm501

2008-10-22 01:39:55 +02:00

intel_menlo: fix build warning

2008-10-23 00:43:47 -04:00

[PATCH] switch mmc

2008-10-21 07:48:37 -04:00

[PATCH] propagate mode through open_bdev_excl/close_bdev_excl

2008-10-21 07:49:00 -04:00

Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6

2008-10-23 09:16:56 -07:00

nubus: fix mis-indented statement

2008-10-16 11:21:30 -07:00

Merge commit 'kumar/kumar-for-2.6.28'

2008-10-21 15:49:55 +11:00

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile

2008-10-23 10:05:40 -07:00

[PATCH] introduce fmode_t, do annotations

2008-10-21 07:47:06 -04:00

8250: Oxford Semiconductor Devices

2008-10-23 09:31:09 -07:00

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2008-10-23 10:20:36 -07:00

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

2008-10-23 08:12:21 -07:00

Merge branch 'linus' into test

2008-10-23 00:11:07 -04:00

Merge git://git.infradead.org/battery-2.6

2008-10-20 09:44:30 -07:00

ps3: Add passthru support for non-audio streams

2008-10-20 08:05:15 +02:00

…

da903x: add regulator support for DA9030/DA9034

2008-10-13 21:51:57 +01:00

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

2008-10-23 10:20:15 -07:00

Merge branch 'v28-range-hrtimers-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2008-10-23 10:53:02 -07:00

sparc: Kill sbus mostek RTC driver.

2008-09-03 15:55:32 -07:00

[PATCH] switch sr

2008-10-21 07:48:50 -04:00

8250: Add more OxSemi devices

2008-10-23 09:35:18 -07:00

sh: Move the shared INTC code out to drivers/sh/

2008-10-01 16:13:54 +09:00

…

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

2008-10-16 12:40:26 -07:00

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

2008-10-13 14:12:40 -07:00

pcc-acpi: fix compile with new stricter ACPI types

2008-10-23 11:54:08 -07:00

…

phonedev: remove BKL

2008-10-20 08:52:36 -07:00

…

Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

2008-10-20 13:42:14 -07:00

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

2008-10-23 10:09:50 -07:00

uwb: wrong sizeof argument in mac address compare

2008-10-20 14:37:53 +01:00

Remove empty imacfb.c file

2008-10-20 11:32:09 -07:00

virtio_balloon: fix towards_target when deflating balloon

2008-08-26 00:19:25 +10:00

x86: sysfs: kill owner field from attribute

2008-10-20 08:52:42 -07:00

watchdog: Fix warning

2008-10-23 09:19:47 -07:00

x86, um: ... and asm-x86 move

2008-10-22 22:55:20 -07:00

…

Kconfig

Merge branch 'master' into for-upstream

2008-10-20 16:07:19 +01:00

Makefile

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2008-10-23 10:20:36 -07:00