remove left-over sysdev.h

1 files changed, 186 insertions, 13 deletions

diff --git a/99-core-remove.patch b/99-core-remove.patch
index a77373c..032d6e3 100644
--- a/99-core-remove.patch
+++ b/99-core-remove.patch
@@ -7,20 +7,140 @@ like everything else in the system.
 
 Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
 ---
- arch/x86/kernel/hpet.c           |    1 
- arch/x86/kernel/irqinit.c        |    2 
- arch/x86/platform/uv/uv_sysfs.c  |    2 
- drivers/base/Makefile            |    2 
- drivers/base/sys.c               |  383 ---------------------------------------
- drivers/leds/led-class.c         |    1 
- drivers/leds/led-triggers.c      |    1 
- drivers/net/bonding/bond_sysfs.c |    1 
- include/linux/kobject.h          |    2 
- include/linux/sysdev.h           |  164 ----------------
- kernel/time/clockevents.c        |    1 
- lib/kobject.c                    |   37 ---
- 12 files changed, 3 insertions(+), 594 deletions(-)
+ arch/avr32/boards/merisc/merisc_sysfs.c      |    1 
+ arch/avr32/kernel/irq.c                      |    2 
+ arch/mips/txx9/generic/setup_tx4939.c        |    2 
+ arch/powerpc/platforms/cell/smp.c            |    2 
+ arch/powerpc/platforms/iseries/smp.c         |    2 
+ arch/powerpc/platforms/powermac/cpufreq_32.c |    2 
+ arch/powerpc/platforms/pseries/smp.c         |    2 
+ arch/powerpc/sysdev/uic.c                    |    1 
+ arch/unicore32/kernel/puv3-core.c            |    1 
+ arch/unicore32/kernel/puv3-nb0916.c          |    1 
+ arch/x86/kernel/hpet.c                       |    1 
+ arch/x86/kernel/irqinit.c                    |    2 
+ arch/x86/platform/uv/uv_sysfs.c              |    2 
+ drivers/base/Makefile                        |    2 
+ drivers/base/sys.c                           |  383 ---------------------------
+ drivers/gpio/gpio-samsung.c                  |    2 
+ drivers/leds/led-class.c                     |    1 
+ drivers/leds/led-triggers.c                  |    1 
+ drivers/macintosh/smu.c                      |    4 
+ drivers/net/bonding/bond_sysfs.c             |    1 
+ drivers/platform/x86/intel_scu_ipc.c         |    2 
+ drivers/s390/block/xpram.c                   |    2 
+ include/linux/kobject.h                      |    2 
+ include/linux/sysdev.h                       |  164 -----------
+ kernel/time/clockevents.c                    |    1 
+ lib/kobject.c                                |   37 --
+ 26 files changed, 12 insertions(+), 611 deletions(-)
 
+--- a/arch/avr32/boards/merisc/merisc_sysfs.c
++++ b/arch/avr32/boards/merisc/merisc_sysfs.c
+@@ -13,7 +13,6 @@
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/timer.h>
+ #include <linux/err.h>
+ #include <linux/ctype.h>
+--- a/arch/avr32/kernel/irq.c
++++ b/arch/avr32/kernel/irq.c
+@@ -14,7 +14,7 @@
+ #include <linux/kernel_stat.h>
+ #include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
+-#include <linux/sysdev.h>
++#include <linux/device.h>
+ 
+ /* May be overridden by platform code */
+ int __weak nmi_enable(void)
+--- a/arch/mips/txx9/generic/setup_tx4939.c
++++ b/arch/mips/txx9/generic/setup_tx4939.c
+@@ -15,7 +15,7 @@
+ #include <linux/delay.h>
+ #include <linux/netdevice.h>
+ #include <linux/notifier.h>
+-#include <linux/sysdev.h>
++#include <linux/device.h>
+ #include <linux/ethtool.h>
+ #include <linux/param.h>
+ #include <linux/ptrace.h>
+--- a/arch/powerpc/platforms/cell/smp.c
++++ b/arch/powerpc/platforms/cell/smp.c
+@@ -23,7 +23,7 @@
+ #include <linux/spinlock.h>
+ #include <linux/cache.h>
+ #include <linux/err.h>
+-#include <linux/sysdev.h>
++#include <linux/device.h>
+ #include <linux/cpu.h>
+ 
+ #include <asm/ptrace.h>
+--- a/arch/powerpc/platforms/iseries/smp.c
++++ b/arch/powerpc/platforms/iseries/smp.c
+@@ -24,7 +24,7 @@
+ #include <linux/spinlock.h>
+ #include <linux/cache.h>
+ #include <linux/err.h>
+-#include <linux/sysdev.h>
++#include <linux/device.h>
+ #include <linux/cpu.h>
+ 
+ #include <asm/ptrace.h>
+--- a/arch/powerpc/platforms/powermac/cpufreq_32.c
++++ b/arch/powerpc/platforms/powermac/cpufreq_32.c
+@@ -23,7 +23,7 @@
+ #include <linux/pmu.h>
+ #include <linux/cpufreq.h>
+ #include <linux/init.h>
+-#include <linux/sysdev.h>
++#include <linux/device.h>
+ #include <linux/hardirq.h>
+ #include <asm/prom.h>
+ #include <asm/machdep.h>
+--- a/arch/powerpc/platforms/pseries/smp.c
++++ b/arch/powerpc/platforms/pseries/smp.c
+@@ -22,7 +22,7 @@
+ #include <linux/spinlock.h>
+ #include <linux/cache.h>
+ #include <linux/err.h>
+-#include <linux/sysdev.h>
++#include <linux/device.h>
+ #include <linux/cpu.h>
+ 
+ #include <asm/ptrace.h>
+--- a/arch/powerpc/sysdev/uic.c
++++ b/arch/powerpc/sysdev/uic.c
+@@ -18,7 +18,6 @@
+ #include <linux/stddef.h>
+ #include <linux/sched.h>
+ #include <linux/signal.h>
+-#include <linux/sysdev.h>
+ #include <linux/device.h>
+ #include <linux/bootmem.h>
+ #include <linux/spinlock.h>
+--- a/arch/unicore32/kernel/puv3-core.c
++++ b/arch/unicore32/kernel/puv3-core.c
+@@ -13,7 +13,6 @@
+ 
+ #include <linux/init.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/amba/bus.h>
+ #include <linux/platform_device.h>
+ #include <linux/io.h>
+--- a/arch/unicore32/kernel/puv3-nb0916.c
++++ b/arch/unicore32/kernel/puv3-nb0916.c
+@@ -13,7 +13,6 @@
+ 
+ #include <linux/init.h>
+ #include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/platform_device.h>
+ #include <linux/mtd/physmap.h>
+ #include <linux/io.h>
 --- a/arch/x86/kernel/hpet.c
 +++ b/arch/x86/kernel/hpet.c
 @@ -2,7 +2,6 @@
@@ -449,6 +569,17 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
 -}
 -EXPORT_SYMBOL_GPL(sysdev_show_int);
 -
+--- a/drivers/gpio/gpio-samsung.c
++++ b/drivers/gpio/gpio-samsung.c
+@@ -22,7 +22,7 @@
+ #include <linux/spinlock.h>
+ #include <linux/module.h>
+ #include <linux/interrupt.h>
+-#include <linux/sysdev.h>
++#include <linux/device.h>
+ #include <linux/ioport.h>
+ 
+ #include <asm/irq.h>
 --- a/drivers/leds/led-class.c
 +++ b/drivers/leds/led-class.c
 @@ -15,7 +15,6 @@
@@ -469,6 +600,26 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
  #include <linux/timer.h>
  #include <linux/rwsem.h>
  #include <linux/leds.h>
+--- a/drivers/macintosh/smu.c
++++ b/drivers/macintosh/smu.c
+@@ -32,7 +32,6 @@
+ #include <linux/completion.h>
+ #include <linux/miscdevice.h>
+ #include <linux/delay.h>
+-#include <linux/sysdev.h>
+ #include <linux/poll.h>
+ #include <linux/mutex.h>
+ #include <linux/of_device.h>
+@@ -681,9 +680,6 @@ static struct platform_driver smu_of_pla
+ static int __init smu_init_sysfs(void)
+ {
+ 	/*
+-	 * Due to sysfs bogosity, a sysdev is not a real device, so
+-	 * we should in fact create both if we want sysdev semantics
+-	 * for power management.
+ 	 * For now, we don't power manage machines with an SMU chip,
+ 	 * I'm a bit too far from figuring out how that works with those
+ 	 * new chipsets, but that will come back and bite us
 --- a/drivers/net/bonding/bond_sysfs.c
 +++ b/drivers/net/bonding/bond_sysfs.c
 @@ -26,7 +26,6 @@
@@ -479,6 +630,28 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
  #include <linux/fs.h>
  #include <linux/types.h>
  #include <linux/string.h>
+--- a/drivers/platform/x86/intel_scu_ipc.c
++++ b/drivers/platform/x86/intel_scu_ipc.c
+@@ -19,7 +19,7 @@
+ #include <linux/delay.h>
+ #include <linux/errno.h>
+ #include <linux/init.h>
+-#include <linux/sysdev.h>
++#include <linux/device.h>
+ #include <linux/pm.h>
+ #include <linux/pci.h>
+ #include <linux/interrupt.h>
+--- a/drivers/s390/block/xpram.c
++++ b/drivers/s390/block/xpram.c
+@@ -36,7 +36,7 @@
+ #include <linux/blkdev.h>
+ #include <linux/blkpg.h>
+ #include <linux/hdreg.h>  /* HDIO_GETGEO */
+-#include <linux/sysdev.h>
++#include <linux/device.h>
+ #include <linux/bio.h>
+ #include <linux/suspend.h>
+ #include <linux/platform_device.h>
 --- a/include/linux/kobject.h
 +++ b/include/linux/kobject.h
 @@ -191,8 +191,6 @@ static inline struct kobj_type *get_ktyp