Frederic Weisbecker 79a56ed0e1 nvram: Fix missing smp_lock.h in nvram ... The bkl has been removed from nvram_llseek() and smp_lock.h was removed because another patch in the same tree zapped the remaining usage of bkl in the same file. But this patch must have been excluded later, then we still need the smp_lock.h headers for the bkl use in nvram_open(). This fixes the following build error: drivers/char/nvram.c: In function ‘nvram_open’: drivers/char/nvram.c:332: erreur: implicit declaration of function ‘lock_kernel’ drivers/char/nvram.c:339: erreur: implicit declaration of function ‘unlock_kernel’ make[2]: *** [drivers/char/nvram.o] Erreur 1 make[1]: *** [drivers/char] Erreur 2 make: *** [drivers] Erreur 2 Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2009-12-09 18:53:23 -08:00
..
accessibility
acpi	Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-12-08 13:27:33 -08:00
amba
ata	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2009-12-08 08:18:01 -08:00
atm	drivers/atm/solos-pci.c: fix warning/bug, clean up code	2009-11-18 05:03:32 -08:00
auxdisplay
base	PM / Runtime: Remove unnecessary braces in __pm_runtime_set_status()	2009-12-06 16:17:57 +01:00
block	drbd_req.c: use part_[inc|dec]_in_flight()	2009-12-03 17:40:51 +01:00
bluetooth	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-05 15:22:26 -08:00
cdrom	sysctl: Drop & in front of every proc_handler.	2009-11-18 08:37:40 -08:00
char	nvram: Fix missing smp_lock.h in nvram	2009-12-09 18:53:23 -08:00
clocksource
connector
cpufreq	[CPUFREQ] Fix stale cpufreq_cpu_governor pointer	2009-11-17 23:15:04 -05:00
cpuidle
crypto
dca
dio	m68k: don't export static inline functions	2009-12-06 11:18:28 +01:00
dma	Merge branches 'at91', 'ep93xx', 'etm', 'ks8695', 'nuc', 'u300' and 'u8500' into devel	2009-12-05 10:35:18 +00:00
edac	Merge branch 'perf/mce' into perf/core	2009-12-03 20:11:06 +01:00
eisa
firewire	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2009-12-08 08:13:10 -08:00
firmware
gpio	gpio: Langwell GPIO driver bugfixes	2009-12-01 16:32:19 -08:00
gpu	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel	2009-11-30 13:57:19 -08:00
hid
hwmon
i2c	i2c-stub: Allow user to disable some commands	2009-12-06 17:06:29 +01:00
ide	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2009-12-08 08:18:01 -08:00
idle
ieee1394	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2009-12-08 08:13:10 -08:00
ieee802154	ieee802154: merge cleanup	2009-12-02 01:13:11 -08:00
infiniband	Merge branch 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-12-09 08:07:38 -08:00
input	Merge branch 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-12-09 08:07:38 -08:00
isdn	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-05 15:22:26 -08:00
leds	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2009-12-08 08:15:29 -08:00
lguest
macintosh	Merge branch 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-12-09 08:07:38 -08:00
mca
md	Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6	2009-12-08 07:38:50 -08:00
media	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2009-12-08 07:47:46 -08:00
memstick
message
mfd	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2009-12-08 08:15:29 -08:00
misc	Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2009-12-08 08:12:16 -08:00
mmc	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2009-12-08 08:15:29 -08:00
mtd	Merge branch 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block	2009-12-08 08:19:16 -08:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6	2009-12-08 07:38:50 -08:00
nubus
of
oprofile
parisc	Merge branch 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-12-09 08:07:38 -08:00
parport	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2009-12-08 08:13:35 -08:00
pci	Merge branch 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-12-08 19:26:55 -08:00
pcmcia	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2009-12-08 08:15:29 -08:00
platform	Merge branch 'misc-2.6.32' into release	2009-11-25 01:01:29 -05:00
pnp
power	collie: add battery driver	2009-11-27 21:07:23 +01:00
pps
ps3
rapidio
regulator	regulator: Initialise wm831x structure pointor for ISINK driver	2009-12-02 19:37:16 +00:00
rtc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2009-12-08 08:13:35 -08:00
s390	Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-12-08 19:27:08 -08:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6	2009-12-08 07:38:50 -08:00
serial	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2009-12-08 08:12:43 -08:00
sfi
sh
sn
spi	Merge branch 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-12-09 08:07:38 -08:00
ssb	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-05 15:22:26 -08:00
staging	Merge branch 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block	2009-12-08 08:19:16 -08:00
tc
telephony
thermal
uio
usb	Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2009-12-08 08:15:29 -08:00
uwb
video	Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-12-08 13:35:29 -08:00
virtio
vlynq
w1
watchdog	Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog	2009-12-08 15:55:00 -08:00
xen
zorro	m68k: don't export static inline functions	2009-12-06 11:18:28 +01:00
Kconfig
Makefile