git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
[sfrench/cifs-2.6.git]
/
arch
/
ppc
/
Kconfig
diff --git
a/arch/ppc/Kconfig
b/arch/ppc/Kconfig
index 531156f8919ca5e4877f1835a14a303a232496ae..abc877faf1232eb73cc284d6737e8ef356bef308 100644
(file)
--- a/
arch/ppc/Kconfig
+++ b/
arch/ppc/Kconfig
@@
-42,6
+42,7
@@
config GENERIC_CALIBRATE_DELAY
config PPC
bool
default y
+ select HAVE_IDE
select HAVE_OPROFILE
select HAVE_KPROBES