Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186452
b: refs/heads/master
c: b8fa057
h: refs/heads/master
v: v3
  • Loading branch information
Linus Torvalds committed Mar 7, 2010
1 parent 393d7fe commit 040bbc2
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4da0b66c6e9ea7ba78a19f9f186779826d89f8b0
refs/heads/master: b8fa05719ba4349be80ce929237249b57886a203
1 change: 0 additions & 1 deletion trunk/drivers/gpu/drm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ menuconfig DRM
depends on (AGP || AGP=n) && PCI && !EMULATED_CMPXCHG && MMU
select I2C
select I2C_ALGOBIT
select LIST_SORT
help
Kernel-level support for the Direct Rendering Infrastructure (DRI)
introduced in XFree86 4.0. If you say Y here, you need to select
Expand Down
1 change: 0 additions & 1 deletion trunk/fs/ubifs/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ config UBIFS_FS
select CRYPTO if UBIFS_FS_ZLIB
select CRYPTO_LZO if UBIFS_FS_LZO
select CRYPTO_DEFLATE if UBIFS_FS_ZLIB
select LIST_SORT
depends on MTD_UBI
help
UBIFS is a file system for flash devices which works on top of UBI.
Expand Down
3 changes: 0 additions & 3 deletions trunk/lib/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,6 @@ config TEXTSEARCH_BM
config TEXTSEARCH_FSM
tristate

config LIST_SORT
boolean

config BTREE
boolean

Expand Down
3 changes: 1 addition & 2 deletions trunk/lib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ lib-y += kobject.o kref.o klist.o

obj-y += bcd.o div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
bust_spinlocks.o hexdump.o kasprintf.o bitmap.o scatterlist.o \
string_helpers.o gcd.o
string_helpers.o gcd.o list_sort.o

ifeq ($(CONFIG_DEBUG_KOBJECT),y)
CFLAGS_kobject.o += -DDEBUG
Expand All @@ -40,7 +40,6 @@ lib-$(CONFIG_GENERIC_FIND_FIRST_BIT) += find_next_bit.o
lib-$(CONFIG_GENERIC_FIND_NEXT_BIT) += find_next_bit.o
obj-$(CONFIG_GENERIC_FIND_LAST_BIT) += find_last_bit.o
obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
obj-$(CONFIG_LIST_SORT) += list_sort.o
obj-$(CONFIG_LOCK_KERNEL) += kernel_lock.o
obj-$(CONFIG_BTREE) += btree.o
obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
Expand Down

0 comments on commit 040bbc2

Please sign in to comment.